summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-04-27 21:33:01 -0400
committerGlenn Morris <rgm@gnu.org>2015-04-27 21:33:01 -0400
commitb09deaa5a9d54658f6432b0a5aa45c834e162c43 (patch)
treee552da274dfa96b018d3795f28bcd4674302e22b /test
parent9c3e1e4e5bc230c4b4fd6649b6afb5d4792592c2 (diff)
downloademacs-b09deaa5a9d54658f6432b0a5aa45c834e162c43.tar.gz
* test/automated/package-test.el (package-test-update-archives-async):
Try to handle the test server script dying.
Diffstat (limited to 'test')
-rw-r--r--test/automated/package-test.el5
1 files changed, 4 insertions, 1 deletions
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."