From b09deaa5a9d54658f6432b0a5aa45c834e162c43 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 27 Apr 2015 21:33:01 -0400 Subject: [PATCH] * test/automated/package-test.el (package-test-update-archives-async): Try to handle the test server script dying. --- test/automated/package-test.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/automated/package-test.el b/test/automated/package-test.el index 4385ee0bd48..1f8f8ac3289 100644 --- a/test/automated/package-test.el +++ b/test/automated/package-test.el @@ -361,10 +361,13 @@ Must called from within a `tar-mode' buffer." (while package--downloads-in-progress (accept-process-output nil 1)) nil)) + ;; If the server process died, there's some non-Emacs problem. + ;; Eg maybe the port was already in use. + (skip-unless (process-live-p process)) (goto-char (point-min)) (should (search-forward-regexp "^ +simple-single" nil t))) - (kill-process process))))) + (if (process-live-p process) (kill-process process)))))) (ert-deftest package-test-describe-package () "Test displaying help for a package."