From 7b9451f382156bdc20945a63c1507a466959fab1 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 20 May 2011 19:08:11 +1000 Subject: - dtucker@cvs.openbsd.org 2011/05/20 05:19:50 [dynamic-forward.sh] Prevent races in dynamic forwarding test; ok djm --- regress/dynamic-forward.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'regress/dynamic-forward.sh') diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 4674a7baf..12ddef3a5 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.4 2004/06/22 22:55:56 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.5 2011/05/20 05:19:50 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -21,8 +21,21 @@ start_sshd for p in 1 2; do trace "start dynamic forwarding, fork to background" - ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \ - exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' + rm -f $OBJ/remote_pid + ${SSH} -$p -F $OBJ/ssh_config -D $FWDPORT -q somehost \ + exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' & + client_pid=$! + + # Wait for ssh to start + n=0 + while test ! -f $OBJ/remote_pid; do + sleep 1 + n=`expr $n + 1` + if test $n > 60; then + kill $client_pid + fail "Timed out waiting for client to connect" + fi + done for s in 4 5; do for h in 127.0.0.1 localhost; do @@ -41,10 +54,14 @@ for p in 1 2; do if [ $remote -gt 1 ]; then kill -HUP $remote fi + rm -f $OBJ/remote_pid else fail "no pid file: $OBJ/remote_pid" fi + # Wait for listening ssh to terminate + wait + # Must allow time for connection tear-down sleep 2 done -- cgit v1.2.3 From acacced70b3fd520ee3f12d3f477f9fd7c2f687a Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 20 May 2011 19:08:40 +1000 Subject: - dtucker@cvs.openbsd.org 2011/05/20 06:32:30 [dynamic-forward.sh] fix dumb error in dynamic-forward test --- ChangeLog | 3 +++ regress/dynamic-forward.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'regress/dynamic-forward.sh') diff --git a/ChangeLog b/ChangeLog index d5d5df3fa..1aac69cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,9 @@ - dtucker@cvs.openbsd.org 2011/05/20 05:19:50 [dynamic-forward.sh] Prevent races in dynamic forwarding test; ok djm + - dtucker@cvs.openbsd.org 2011/05/20 06:32:30 + [dynamic-forward.sh] + fix dumb error in dynamic-forward test 20110515 - (djm) OpenBSD CVS Sync diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 12ddef3a5..d6df4491a 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.5 2011/05/20 05:19:50 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.6 2011/05/20 06:32:30 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -31,7 +31,7 @@ for p in 1 2; do while test ! -f $OBJ/remote_pid; do sleep 1 n=`expr $n + 1` - if test $n > 60; then + if test $n -gt 60; then kill $client_pid fail "Timed out waiting for client to connect" fi -- cgit v1.2.3 From 260c8fbc4d8c5865fc312ed56a48b36817507b30 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 3 Jun 2011 14:17:27 +1000 Subject: - dtucker@cvs.openbsd.org 2011/05/31 02:01:58 [regress/dynamic-forward.sh] back out revs 1.6 and 1.5 since it's not reliable --- ChangeLog | 3 +++ regress/dynamic-forward.sh | 26 +++----------------------- 2 files changed, 6 insertions(+), 23 deletions(-) (limited to 'regress/dynamic-forward.sh') diff --git a/ChangeLog b/ChangeLog index 2831c374f..3b5aa258f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,9 @@ has exited, rather than attempting to send a zero signal, since the latter won't work if the parent has changed privs. bz#1905, patch from Daniel Kahn Gillmor, ok djm@ + - dtucker@cvs.openbsd.org 2011/05/31 02:01:58 + [regress/dynamic-forward.sh] + back out revs 1.6 and 1.5 since it's not reliable 20110529 - (djm) OpenBSD CVS Sync diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index d6df4491a..0a862b504 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.6 2011/05/20 06:32:30 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.7 2011/05/31 02:01:58 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -21,21 +21,8 @@ start_sshd for p in 1 2; do trace "start dynamic forwarding, fork to background" - rm -f $OBJ/remote_pid - ${SSH} -$p -F $OBJ/ssh_config -D $FWDPORT -q somehost \ - exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' & - client_pid=$! - - # Wait for ssh to start - n=0 - while test ! -f $OBJ/remote_pid; do - sleep 1 - n=`expr $n + 1` - if test $n -gt 60; then - kill $client_pid - fail "Timed out waiting for client to connect" - fi - done + ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \ + exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' for s in 4 5; do for h in 127.0.0.1 localhost; do @@ -54,14 +41,7 @@ for p in 1 2; do if [ $remote -gt 1 ]; then kill -HUP $remote fi - rm -f $OBJ/remote_pid else fail "no pid file: $OBJ/remote_pid" fi - - # Wait for listening ssh to terminate - wait - - # Must allow time for connection tear-down - sleep 2 done -- cgit v1.2.3 From 75e035c34e323cccb19aab5d58cb9c706ce8fcee Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 3 Jun 2011 14:18:17 +1000 Subject: - dtucker@cvs.openbsd.org 2011/05/31 02:03:34 [regress/dynamic-forward.sh] work around startup and teardown races; caught by deraadt --- ChangeLog | 3 +++ regress/dynamic-forward.sh | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'regress/dynamic-forward.sh') diff --git a/ChangeLog b/ChangeLog index 3b5aa258f..af92ed3f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,9 @@ - dtucker@cvs.openbsd.org 2011/05/31 02:01:58 [regress/dynamic-forward.sh] back out revs 1.6 and 1.5 since it's not reliable + - dtucker@cvs.openbsd.org 2011/05/31 02:03:34 + [regress/dynamic-forward.sh] + work around startup and teardown races; caught by deraadt 20110529 - (djm) OpenBSD CVS Sync diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 0a862b504..39b58c817 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.7 2011/05/31 02:01:58 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.8 2011/05/31 02:03:34 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -21,7 +21,8 @@ start_sshd for p in 1 2; do trace "start dynamic forwarding, fork to background" - ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \ + ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \ + -oExitOnForwardFailure=yes somehost \ exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' for s in 4 5; do @@ -41,6 +42,7 @@ for p in 1 2; do if [ $remote -gt 1 ]; then kill -HUP $remote fi + sleep 1 else fail "no pid file: $OBJ/remote_pid" fi -- cgit v1.2.3 From bf4d05a37ca67a2b2c69ef072652b6be3b24fd76 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 3 Jun 2011 14:19:02 +1000 Subject: - dtucker@cvs.openbsd.org 2011/06/03 00:29:52 [regress/dynamic-forward.sh] Retry establishing the port forwarding after a small delay, should make the tests less flaky when the previous test is slow to shut down and free up the port. --- ChangeLog | 5 +++++ regress/dynamic-forward.sh | 22 +++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'regress/dynamic-forward.sh') diff --git a/ChangeLog b/ChangeLog index af92ed3f9..c4ced5da6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,11 @@ - dtucker@cvs.openbsd.org 2011/05/31 02:03:34 [regress/dynamic-forward.sh] work around startup and teardown races; caught by deraadt + - dtucker@cvs.openbsd.org 2011/06/03 00:29:52 + [regress/dynamic-forward.sh] + Retry establishing the port forwarding after a small delay, should make + the tests less flaky when the previous test is slow to shut down and free + up the port. 20110529 - (djm) OpenBSD CVS Sync diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 39b58c817..d1ab8059b 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.8 2011/05/31 02:03:34 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.9 2011/06/03 00:29:52 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -20,10 +20,23 @@ trace "will use ProxyCommand $proxycmd" start_sshd for p in 1 2; do + n=0 + error="1" trace "start dynamic forwarding, fork to background" - ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \ - -oExitOnForwardFailure=yes somehost \ - exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' + while [ "$error" -ne 0 -a "$n" -lt 3 ]; do + n=`expr $n + 1` + ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \ + -oExitOnForwardFailure=yes somehost exec sh -c \ + \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' + error=$? + if [ "$error" -ne 0 ]; then + trace "forward failed proto $p attempt $n err $error" + sleep $n + fi + done + if [ "$error" -ne 0 ]; then + fatal "failed to start dynamic forwarding proto $p" + fi for s in 4 5; do for h in 127.0.0.1 localhost; do @@ -42,7 +55,6 @@ for p in 1 2; do if [ $remote -gt 1 ]; then kill -HUP $remote fi - sleep 1 else fail "no pid file: $OBJ/remote_pid" fi -- cgit v1.2.3