From: Glenn Morris <rgm@gnu.org>
Date: Fri, 21 Jul 2017 18:01:12 +0000 (-0400)
Subject: Further attempt to avoid hang in network-stream-tests
X-Git-Tag: emacs-26.0.90~518^2~39
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9742069276b497eb4190dade54dd239e2cf78c17;p=emacs.git

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.
---

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 @@
                       (< (setq times (1+ times)) 10))
             (sit-for 0.1))
           (should proc)
-          (while (eq (process-status proc) 'connect)
-            (sit-for 0.1)))
+          (setq times 0)
+          (while (and (eq (process-status proc) 'connect)
+                      (< (setq times (1+ times)) 10))
+            (sit-for 0.1))
+          (skip-unless (not (eq (process-status proc) 'connect))))
       (if (process-live-p server) (delete-process server)))
     (setq status (gnutls-peer-status proc))
     (should (consp status))