mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-24 10:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2009/05/05 07:51:36

Browse Source 
[regress/multiplex.sh]
     Always specify ssh_config for multiplex tests: prevents breakage caused
     by options in ~/.ssh/config.  From Dan Peterson.
This commit is contained in:
Darren Tucker 2009-10-07 10:30:57 +11:00
parent 7023d161d8
commit 7988553585
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -92,6 +92,10 @@
[regress/addrmatch.sh] [regress/addrmatch.sh]
match string "passwordauthentication" only at start of line, not anywhere match string "passwordauthentication" only at start of line, not anywhere
in sshd -T output in sshd -T output
- dtucker@cvs.openbsd.org 2009/05/05 07:51:36
[regress/multiplex.sh]
Always specify ssh_config for multiplex tests: prevents breakage caused
by options in ~/.ssh/config. From Dan Peterson.
20091002 20091002
- (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.

20
regress/multiplex.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.11 2005/04/25 09:54:09 dtucker Exp $ # $OpenBSD: multiplex.sh,v 1.12 2009/05/05 07:51:36 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
CTL=/tmp/openssh.regress.ctl-sock.$$ CTL=/tmp/openssh.regress.ctl-sock.$$
@ -26,7 +26,7 @@ sleep 5
verbose "test $tid: envpass" verbose "test $tid: envpass"
trace "env passing over multiplexed connection" trace "env passing over multiplexed connection"
_XXX_TEST=blah ${SSH} -oSendEnv="_XXX_TEST" -S$CTL otherhost sh << 'EOF' _XXX_TEST=blah ${SSH} -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" -S$CTL otherhost sh << 'EOF'
test X"$_XXX_TEST" = X"blah" test X"$_XXX_TEST" = X"blah"
EOF EOF
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -36,26 +36,26 @@ fi
verbose "test $tid: transfer" verbose "test $tid: transfer"
rm -f ${COPY} rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result" trace "ssh transfer over multiplexed connection and check result"
${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} ${SSH} -F $OBJ/ssh_config -S$CTL otherhost cat ${DATA} > ${COPY}
test -f ${COPY} || fail "ssh -Sctl: failed copy ${DATA}" test -f ${COPY} || fail "ssh -Sctl: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "ssh -Sctl: corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "ssh -Sctl: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result" trace "ssh transfer over multiplexed connection and check result"
${SSH} -S $CTL otherhost cat ${DATA} > ${COPY} ${SSH} -F $OBJ/ssh_config -S $CTL otherhost cat ${DATA} > ${COPY}
test -f ${COPY} || fail "ssh -S ctl: failed copy ${DATA}" test -f ${COPY} || fail "ssh -S ctl: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "ssh -S ctl: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "sftp transfer over multiplexed connection and check result" trace "sftp transfer over multiplexed connection and check result"
echo "get ${DATA} ${COPY}" | \ echo "get ${DATA} ${COPY}" | \
${SFTP} -S ${SSH} -oControlPath=$CTL otherhost >$LOG 2>&1 ${SFTP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost >$LOG 2>&1
test -f ${COPY} || fail "sftp: failed copy ${DATA}" test -f ${COPY} || fail "sftp: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "sftp: corrupted copy of ${DATA}"
rm -f ${COPY} rm -f ${COPY}
trace "scp transfer over multiplexed connection and check result" trace "scp transfer over multiplexed connection and check result"
${SCP} -S ${SSH} -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1 ${SCP} -S ${SSH} -F $OBJ/ssh_config -oControlPath=$CTL otherhost:${DATA} ${COPY} >$LOG 2>&1
test -f ${COPY} || fail "scp: failed copy ${DATA}" test -f ${COPY} || fail "scp: failed copy ${DATA}"
cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}" cmp ${DATA} ${COPY} || fail "scp: corrupted copy of ${DATA}"
@ -64,7 +64,7 @@ rm -f ${COPY}
for s in 0 1 4 5 44; do for s in 0 1 4 5 44; do
trace "exit status $s over multiplexed connection" trace "exit status $s over multiplexed connection"
verbose "test $tid: status $s" verbose "test $tid: status $s"
${SSH} -S $CTL otherhost exit $s ${SSH} -F $OBJ/ssh_config -S $CTL otherhost exit $s
r=$? r=$?
if [ $r -ne $s ]; then if [ $r -ne $s ]; then
fail "exit code mismatch for protocol $p: $r != $s" fail "exit code mismatch for protocol $p: $r != $s"
@ -72,7 +72,7 @@ for s in 0 1 4 5 44; do
# same with early close of stdout/err # same with early close of stdout/err
trace "exit status $s with early close over multiplexed connection" trace "exit status $s with early close over multiplexed connection"
${SSH} -S $CTL -n otherhost \ ${SSH} -F $OBJ/ssh_config -S $CTL -n otherhost \
exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\' exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\'
r=$? r=$?
if [ $r -ne $s ]; then if [ $r -ne $s ]; then
@ -81,10 +81,10 @@ for s in 0 1 4 5 44; do
done done
trace "test check command" trace "test check command"
${SSH} -S $CTL -Ocheck otherhost || fail "check command failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Ocheck otherhost || fail "check command failed"
trace "test exit command" trace "test exit command"
${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed" ${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost || fail "send exit command failed"
# Wait for master to exit # Wait for master to exit
sleep 2 sleep 2