From 546d30ed1400d5a434886790a102bd37ec852919 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Wed, 22 Feb 2017 16:56:14 -0500 Subject: 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. --- test/lisp/emacs-lisp/package-tests.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'test/lisp/emacs-lisp/package-tests.el') diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el index 2e4666e7fe3..5172b482cb0 100644 --- a/test/lisp/emacs-lisp/package-tests.el +++ b/test/lisp/emacs-lisp/package-tests.el @@ -376,22 +376,19 @@ Must called from within a `tar-mode' buffer." "package-server" "package-server-buffer" (executable-find "python2") "package-test-server.py")) - port) + (addr nil)) (unwind-protect (progn (with-current-buffer "package-server-buffer" (should (with-timeout (10 nil) - (while (not port) + (while (not addr) (accept-process-output nil 1) (goto-char (point-min)) - (if (re-search-forward "Serving HTTP on .* port \\([0-9]+\\) " - nil t) - (setq port (match-string 1)))) - port))) - (with-package-test (:basedir - package-test-data-dir - :location (format "http://0.0.0.0:%s/" port)) + (when (re-search-forward "Server started, \\(.*\\)\n" nil t) + (setq addr (match-string 1)))) + addr))) + (with-package-test (:basedir package-test-data-dir :location addr) (list-packages) (should package--downloads-in-progress) (should mode-line-process) -- cgit v1.2.3