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

     [multiplex.sh]
     regression tests for new multiplex commands

diff --git a/ChangeLog b/ChangeLog
index 15a59e54be03be63335bc114902da80ef617643c..8b768d9bfd76bdafa3b51b6751bfa6fe0299b505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@
    - djm@cvs.openbsd.org 2004/10/29 23:59:22
      [Makefile added brokenkeys.sh]
      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
  - (dtucker) OpenBSD CVS Sync

diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index c0adf109fecaf1eff0d55b6f218281a222d58100..15e518c86b603e6b29dd6201b716a576440c99e4 100644 (file)
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -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.
 
 CTL=$OBJ/ctl-sock
@@ -17,7 +17,11 @@ COPY=$OBJ/ls.copy
 start_sshd
 
 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"
 trace "env passing over multiplexed connection"
@@ -75,6 +79,15 @@ for s in 0 1 4 5 44; do
        fi
 done
 
-# kill master, remove control socket.  ssh -MS will exit when sleep exits
-$SUDO kill `cat $PIDFILE`
-rm -f $CTL
+trace "test check command"
+${SSH} -S $CTL -Ocheck otherhost || fail "check command failed" 
+
+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