aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2017-01-11 14:35:51 -0500
committerGlenn Morris2017-01-11 14:35:51 -0500
commit255f675d890b7fa2dc97a40dc03e82fa95b22e65 (patch)
tree37d362540295ebfc4615d8f5c23dd639e10bd579
parentd569dd2198fb1116b696513d429d89c241021a83 (diff)
downloademacs-255f675d890b7fa2dc97a40dc03e82fa95b22e65.tar.gz
emacs-255f675d890b7fa2dc97a40dc03e82fa95b22e65.zip
Convert some network test failures to skipping
These tests intermittently fail on hydra.nixos.org for unclear reasons related to starting the external process. This isn't an Emacs issue, and the failures cause noise on the emacs-buildstatus list. (Bug#24503) * test/lisp/net/network-stream-tests.el (echo-server-nowait) (connect-to-tls-ipv4-nowait): Skip rather than fail if the external process fails to start properly.
-rw-r--r--test/lisp/net/network-stream-tests.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index b237fea3dd1..e7bb3e8ccf9 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -152,7 +152,7 @@
152 (while (and (eq (process-status proc) 'connect) 152 (while (and (eq (process-status proc) 'connect)
153 (< (setq times (1+ times)) 10)) 153 (< (setq times (1+ times)) 10))
154 (sit-for 0.1)) 154 (sit-for 0.1))
155 (should-not (eq (process-status proc) 'connect)) 155 (skip-unless (not (eq (process-status proc) 'connect)))
156 (with-current-buffer (process-buffer proc) 156 (with-current-buffer (process-buffer proc)
157 (process-send-string proc "echo foo") 157 (process-send-string proc "echo foo")
158 (sleep-for 0.1) 158 (sleep-for 0.1)
@@ -240,7 +240,7 @@
240 (while (and (eq (process-status proc) 'connect) 240 (while (and (eq (process-status proc) 'connect)
241 (< (setq times (1+ times)) 10)) 241 (< (setq times (1+ times)) 10))
242 (sit-for 0.1)) 242 (sit-for 0.1))
243 (should-not (eq (process-status proc) 'connect))) 243 (skip-unless (not (eq (process-status proc) 'connect))))
244 (if (process-live-p server) (delete-process server))) 244 (if (process-live-p server) (delete-process server)))
245 (setq status (gnutls-peer-status proc)) 245 (setq status (gnutls-peer-status proc))
246 (should (consp status)) 246 (should (consp status))