aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGlenn Morris2017-07-21 14:01:12 -0400
committerGlenn Morris2017-07-21 14:01:12 -0400
commit9742069276b497eb4190dade54dd239e2cf78c17 (patch)
tree8a81e6faed12fedf875fd4ac474e04b4bd0db211 /test
parent237e238cfce65ebbd1fbac2e05b9ce8ecf9ab2c1 (diff)
downloademacs-9742069276b497eb4190dade54dd239e2cf78c17.tar.gz
emacs-9742069276b497eb4190dade54dd239e2cf78c17.zip
Further attempt to avoid hang in network-stream-tests
* test/lisp/net/network-stream-tests.el (connect-to-tls-ipv6-nowait): Limit the time we wait for the external process.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/network-stream-tests.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index e7bb3e8ccf9..9ee3a281c3d 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -280,8 +280,11 @@
280 (< (setq times (1+ times)) 10)) 280 (< (setq times (1+ times)) 10))
281 (sit-for 0.1)) 281 (sit-for 0.1))
282 (should proc) 282 (should proc)
283 (while (eq (process-status proc) 'connect) 283 (setq times 0)
284 (sit-for 0.1))) 284 (while (and (eq (process-status proc) 'connect)
285 (< (setq times (1+ times)) 10))
286 (sit-for 0.1))
287 (skip-unless (not (eq (process-status proc) 'connect))))
285 (if (process-live-p server) (delete-process server))) 288 (if (process-live-p server) (delete-process server)))
286 (setq status (gnutls-peer-status proc)) 289 (setq status (gnutls-peer-status proc))
287 (should (consp status)) 290 (should (consp status))