summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/basic3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/basic b/tests/basic
index 3ec4a21..393bcc2 100755
--- a/tests/basic
+++ b/tests/basic
@@ -43,7 +43,7 @@ failed_cleanup() {
}
cleanup() {
- if ( ps "$SSHD_PID" >/dev/null ) ; then
+ if [ "$SSHD_PID" ] && ( ps "$SSHD_PID" >/dev/null ) ; then
echo "### stopping still-running sshd..."
kill "$SSHD_PID"
fi
@@ -82,6 +82,7 @@ export MONKEYSPHERE_CHECK_KEYSERVER=false
export SSHD_CONFIG="$TEMPDIR"/sshd_config
export SOCKET="$TEMPDIR"/ssh-socket
+export SSHD_PID=
# copy in admin and testuser home to tmp
echo "### copying admin and testuser homes..."