From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 05:12:05 +0000 (-0400)
Subject: testing: using jobspec instead of SSHD_PID
X-Git-Tag: monkeysphere_0.16-1~11
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=5e6fa0164c6003d09434e8e1b806a3d9ab8a2fcf;p=monkeysphere.git

testing: using jobspec instead of SSHD_PID
---

diff --git a/tests/basic b/tests/basic
index 30c6d17..cb3730d 100755
--- a/tests/basic
+++ b/tests/basic
@@ -27,10 +27,12 @@ cleanup() {
     read -p "press enter to cleanup and remove tmp:"
 
     echo "### stop sshd..."
-    kill "$SSHD_PID"
+    kill %1
 
     echo "### removing temp dir..."
     rm -rf "$TEMPDIR"
+
+    wait
 }
 
 ## setup trap
@@ -120,8 +122,6 @@ EOF
 # launch test sshd with the new host key.
 echo "### starting sshd..."
 socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -d -d -d -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
-export SSHD_PID=$!
-
 
 ### TESTUSER TESTS