From 3e5ccfd11d143e113944a8c35831618421d90552 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 28 Oct 2008 18:04:51 -0400 Subject: [PATCH] do not choke at end of test suite if no sshd was ever launched. --- tests/basic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..." -- 2.26.2