diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-02-22 16:56:14 -0500 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2017-02-25 12:56:09 -0500 |
| commit | 546d30ed1400d5a434886790a102bd37ec852919 (patch) | |
| tree | 64f7969ff55228c28183b56d98108319fe504965 /test/lisp/emacs-lisp/package-resources/package-test-server.py | |
| parent | 9e9d381ff0c83283278f43a65d3ecefd0cde8041 (diff) | |
| download | emacs-546d30ed1400d5a434886790a102bd37ec852919.tar.gz emacs-546d30ed1400d5a434886790a102bd37ec852919.tar.bz2 emacs-546d30ed1400d5a434886790a102bd37ec852919.zip | |
Don't use IP 0.0.0.0 for package test server (Bug#22582)
* test/lisp/emacs-lisp/package-resources/package-test-server.py: Set
'server_address' when port number is given on the command line. Print
IP and port number as a URL, and flush it after printing.
* test/lisp/emacs-lisp/package-tests.el:
(package-test-update-archives-async): Grab the whole URL from server
output.
Diffstat (limited to 'test/lisp/emacs-lisp/package-resources/package-test-server.py')
| -rw-r--r-- | test/lisp/emacs-lisp/package-resources/package-test-server.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/lisp/emacs-lisp/package-resources/package-test-server.py b/test/lisp/emacs-lisp/package-resources/package-test-server.py index 1acd9f744b9..128b4249ec3 100644 --- a/test/lisp/emacs-lisp/package-resources/package-test-server.py +++ b/test/lisp/emacs-lisp/package-resources/package-test-server.py @@ -11,11 +11,15 @@ if sys.argv[1:]: port = int(sys.argv[1]) else: port = 0 - server_address = ('127.0.0.1', port) +server_address = ('127.0.0.1', port) HandlerClass.protocol_version = Protocol httpd = ServerClass(server_address, HandlerClass) -sa = httpd.socket.getsockname() -print "Serving HTTP on", sa[0], "port", sa[1], "..." +ip, port = httpd.socket.getsockname()[0:2] +print ("Server started, http://%s:%s/" % (ip, port)) +# Flush in case we're in full buffering mode (instead of line +# buffering), this might happen if python is a cygwin program and we +# run it from a native w32 program. +sys.stdout.flush() httpd.serve_forever() |