tests/basic ensure that any lingering sshd process will get killed off.

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index c38a74b96c67c72684ca05aaa5ab59fd2b17f321..5ba7a250b948affc504378ee09f2dce4ba79d76f 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -54,6 +54,7 @@ ssh_test() {
 
     # kill the sshd process if it's still running
     kill "$SSHD_PID"
+    SSHD_PID=
 
     set -e
 
@@ -87,9 +88,16 @@ cleanup() {
     echo "### removing temp dir..."
     rm -rf "$TEMPDIR"
 
+    if [ "$SSHD_PID" ] ; then
+       echo "### killing off lingering sshd..."
+       kill "$SSHD_PID"
+    fi
+
     wait
 }
 
+SSHD_PID=
+
 ## setup trap
 trap failed_cleanup EXIT