do not choke at end of test suite if no sshd was ever launched.

diff --git a/tests/basic b/tests/basic
index 3ec4a21657ca39acfbae7de30d38559f2e3806cb..393bcc22845e50b9cf61e65a83aa386322f17490 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -43,7 +43,7 @@ failed_cleanup() {
 }
 
 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
        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_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..."
 
 # copy in admin and testuser home to tmp
 echo "### copying admin and testuser homes..."