From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 9 Nov 2008 23:08:23 +0000 (-0500)
Subject: tests/basic ensure that any lingering sshd process will get killed off.
X-Git-Tag: monkeysphere_0.20-1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60bb324da7c83092c354a7bb4f66116fddd3790a;p=monkeysphere.git

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

diff --git a/tests/basic b/tests/basic
index c38a74b..5ba7a25 100755
--- 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