- djm@cvs.openbsd.org 2004/11/07 00:32:41

[multiplex.sh]
     regression tests for new multiplex commands
This commit is contained in:
Darren Tucker 2004-12-06 23:12:15 +11:00
parent 124f58ecba
commit 79ec66e980
2 changed files with 22 additions and 6 deletions

View File

@ -38,6 +38,9 @@
- djm@cvs.openbsd.org 2004/10/29 23:59:22 - djm@cvs.openbsd.org 2004/10/29 23:59:22
[Makefile added brokenkeys.sh] [Makefile added brokenkeys.sh]
regression test for handling of corrupt keys in authorized_keys file regression test for handling of corrupt keys in authorized_keys file
- djm@cvs.openbsd.org 2004/11/07 00:32:41
[multiplex.sh]
regression tests for new multiplex commands
20041203 20041203
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
@ -1911,4 +1914,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3595 2004/12/06 12:07:37 dtucker Exp $ $Id: ChangeLog,v 1.3596 2004/12/06 12:12:15 dtucker Exp $

View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.8 2004/06/22 03:12:13 markus Exp $ # $OpenBSD: multiplex.sh,v 1.9 2004/11/07 00:32:41 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
CTL=$OBJ/ctl-sock CTL=$OBJ/ctl-sock
@ -17,7 +17,11 @@ COPY=$OBJ/ls.copy
start_sshd start_sshd
trace "start master, fork to background" trace "start master, fork to background"
${SSH} -2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -f somehost sleep 120 ${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost &
MASTER_PID=$!
# Wait for master to start and authenticate
sleep 5
verbose "test $tid: envpass" verbose "test $tid: envpass"
trace "env passing over multiplexed connection" trace "env passing over multiplexed connection"
@ -75,6 +79,15 @@ for s in 0 1 4 5 44; do
fi fi
done done
# kill master, remove control socket. ssh -MS will exit when sleep exits trace "test check command"
$SUDO kill `cat $PIDFILE` ${SSH} -S $CTL -Ocheck otherhost || fail "check command failed"
rm -f $CTL
trace "test exit command"
${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed"
# Wait for master to exit
sleep 2
ps -p $MASTER_PID >/dev/null && fail "exit command failed"
cleanup