diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-05-07 09:23:40 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-05-07 19:42:35 +1000 |
| commit | a4039724a3f2abac810735fc95cf9114a3856049 (patch) | |
| tree | 0f92b51efd2f8ad428eab2646013c16be36df34a | |
| parent | c0d7e36e979fa3cdb60f5dcb6ac9ad3fd018543b (diff) | |
upstream: Increase ConnectionAttempts from 4 to 10 as the tests
occasionally time out on heavily loaded hosts.
OpenBSD-Regress-ID: 29a8cdef354fc9da471a301f7f65184770434f3a
| -rw-r--r-- | regress/forward-control.sh | 6 | ||||
| -rw-r--r-- | regress/forwarding.sh | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/regress/forward-control.sh b/regress/forward-control.sh index 3b1f69a7..02f7667a 100644 --- a/regress/forward-control.sh +++ b/regress/forward-control.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forward-control.sh,v 1.7 2018/06/07 14:29:43 djm Exp $ +# $OpenBSD: forward-control.sh,v 1.8 2021/05/07 09:23:40 dtucker Exp $ # Placed in the Public Domain. tid="sshd control of local and remote forwarding" @@ -46,7 +46,7 @@ check_lfwd() { wait_for_file_to_appear $READY || \ fatal "check_lfwd ssh fail: $_message" ${SSH} -F $OBJ/ssh_config -p $LFWD_PORT \ - -oConnectionAttempts=4 host true >/dev/null 2>&1 + -oConnectionAttempts=10 host true >/dev/null 2>&1 _result=$? kill $_sshpid `cat $READY` 2>/dev/null wait_for_process_to_exit $_sshpid @@ -76,7 +76,7 @@ check_rfwd() { _result=$? if test $_result -eq 0 ; then ${SSH} -F $OBJ/ssh_config -p $RFWD_PORT \ - -oConnectionAttempts=4 host true >/dev/null 2>&1 + -oConnectionAttempts=10 host true >/dev/null 2>&1 _result=$? kill $_sshpid `cat $READY` 2>/dev/null wait_for_process_to_exit $_sshpid diff --git a/regress/forwarding.sh b/regress/forwarding.sh index cd634f2f..a72bd3a0 100644 --- a/regress/forwarding.sh +++ b/regress/forwarding.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forwarding.sh,v 1.23 2019/07/20 09:50:58 dtucker Exp $ +# $OpenBSD: forwarding.sh,v 1.24 2021/05/07 09:23:40 dtucker Exp $ # Placed in the Public Domain. tid="local and remote forwarding" @@ -29,7 +29,7 @@ rm -f $CTL ${SSH} -S $CTL -N -M -F $OBJ/ssh_config -f $fwd somehost trace "transfer over forwarded channels and check result" -${SSH} -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \ +${SSH} -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=10' \ somehost cat ${DATA} > ${COPY} test -s ${COPY} || fail "failed copy of ${DATA}" cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" @@ -110,7 +110,7 @@ rm -f $CTL ${SSH} -S $CTL -N -M -F $OBJ/ssh_config -f somehost trace "config file: transfer over forwarded channels and check result" -${SSH} -F $OBJ/ssh_config -p${base}02 -o 'ConnectionAttempts=4' \ +${SSH} -F $OBJ/ssh_config -p${base}02 -o 'ConnectionAttempts=10' \ somehost cat ${DATA} > ${COPY} test -s ${COPY} || fail "failed copy of ${DATA}" cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" @@ -124,7 +124,7 @@ ${SSH} -S $CTL -N -M -f -F $OBJ/ssh_config -R${base}01:[$OBJ/unix-1.fwd] somehos ${SSH} -S $CTL.1 -N -M -f -F $OBJ/ssh_config -L[$OBJ/unix-1.fwd]:[$OBJ/unix-2.fwd] somehost ${SSH} -S $CTL.2 -N -M -f -F $OBJ/ssh_config -R[$OBJ/unix-2.fwd]:[$OBJ/unix-3.fwd] somehost ${SSH} -S $CTL.3 -N -M -f -F $OBJ/ssh_config -L[$OBJ/unix-3.fwd]:127.0.0.1:$PORT somehost -${SSH} -F $OBJ/ssh_config -p${base}01 -o 'ConnectionAttempts=4' \ +${SSH} -F $OBJ/ssh_config -p${base}01 -o 'ConnectionAttempts=10' \ somehost cat ${DATA} > ${COPY} test -s ${COPY} || fail "failed copy ${DATA}" cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" |