tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2012/09/10 00:49:21

Browse Source 
[regress/multiplex.sh]
     Log -O cmd output to the log file and make logging consistent with the
     other tests.  Test clean shutdown of an existing channel when testing
     "stop".
This commit is contained in:
Darren Tucker 2012-10-05 11:45:39 +10:00
parent 6fc5aa8b2e
commit 9b2c0360cf
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -37,6 +37,11 @@
- dtucker@cvs.openbsd.org 2012/09/09 11:51:25 - dtucker@cvs.openbsd.org 2012/09/09 11:51:25
[regress/multiplex.sh] [regress/multiplex.sh]
Add test for ssh -Ostop Add test for ssh -Ostop
- dtucker@cvs.openbsd.org 2012/09/10 00:49:21
[regress/multiplex.sh]
Log -O cmd output to the log file and make logging consistent with the
other tests. Test clean shutdown of an existing channel when testing
"stop".
- [Makefile umac.c] Add special-case target to build umac128.o. - [Makefile umac.c] Add special-case target to build umac128.o.
20120917 20120917

23
regress/multiplex.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.14 2012/09/09 11:51:25 dtucker Exp $ # $OpenBSD: multiplex.sh,v 1.15 2012/09/10 00:49:21 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
CTL=/tmp/openssh.regress.ctl-sock.$$ CTL=/tmp/openssh.regress.ctl-sock.$$
@ -78,11 +78,13 @@ for s in 0 1 4 5 44; do
fi fi
done done
trace "test check command" verbose "test $tid: cmd check"
${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost || fail "check command failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost >>$TEST_SSH_LOGFILE 2>&1 \
|| fail "check command failed"
trace "test exit command" verbose "test $tid: cmd exit"
${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost || fail "send exit command failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost >>$TEST_SSH_LOGFILE 2>&1 \
|| fail "send exit command failed"
# Wait for master to exit # Wait for master to exit
sleep 2 sleep 2
@ -94,7 +96,12 @@ trace "start master, fork to background"
${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost & ${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost &
MASTER_PID=$! MASTER_PID=$!
sleep 5 # Wait for master to start and authenticate sleep 5 # Wait for master to start and authenticate
trace "test stop command" verbose "test $tid: cmd stop"
${SSH} -F $OBJ/ssh_config -S $CTL -Ostop otherhost || fail "send stop command failed" ${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" &
sleep 2 # Wait for master to exit SLEEP_PID=$!
${SSH} -F $OBJ/ssh_config -S $CTL -Ostop otherhost >>$TEST_SSH_LOGFILE 2>&1 \
|| fail "send stop command failed"
sleep 12 # Wait for master to exit
wait $SLEEP_PID
[ $! != 0 ] || fail "stop with concurrent command"
ps -p $MASTER_PID >/dev/null && fail "stop command failed" ps -p $MASTER_PID >/dev/null && fail "stop command failed"