]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Wait a bit longer for the multiplex master to become ready
authordtucker@openbsd.org <dtucker@openbsd.org>
Sat, 25 Jan 2020 00:27:56 +0000 (00:27 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 25 Jan 2020 00:51:03 +0000 (11:51 +1100)
since on very slow hosts the current delay is not sufficient and the test
will fail.

OpenBSD-Regress-ID: 6d90c7475d67ac3a95610b64af700629ece51a48

regress/multiplex.sh

index b5e604dba9ba5c7b5a2edb456d7ca4586e480c0a..f93310ed8d2c53b76891a58beb331182f7beffe9 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: multiplex.sh,v 1.30 2019/07/05 04:03:13 dtucker Exp $
+#      $OpenBSD: multiplex.sh,v 1.31 2020/01/25 00:27:56 dtucker Exp $
 #      Placed in the Public Domain.
 
 make_tmpdir
@@ -18,7 +18,7 @@ P=3301  # test port
 
 wait_for_mux_master_ready()
 {
-       for i in 1 2 3 4 5; do
+       for i in 1 2 3 4 5 6 7 8 9; do
                ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost \
                    >/dev/null 2>&1 && return 0
                sleep $i