From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 21:30:15 +0000 (-0500)
Subject: cleanup of how ssh_test return code is captured in tests/basic
X-Git-Tag: monkeysphere_0.23~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd6d9d25138a96a61fc10aabd773926b22e95cb1;p=monkeysphere.git

cleanup of how ssh_test return code is captured in tests/basic
---

diff --git a/tests/basic b/tests/basic
index f76a265..a3d32b4 100755
--- a/tests/basic
+++ b/tests/basic
@@ -57,20 +57,16 @@ ssh_test() {
 	sleep 1
     done
 
-    set +e
-
     # make a client connection to the socket
     echo "##### starting ssh client..."
     ssh-agent bash -c \
-	"monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true"
-    RETURN="$?"
+	"monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true" \
+	|| RETURN="$?"
 
     # kill the sshd process if it's still running
     kill "$SSHD_PID"
     SSHD_PID=
 
-    set -e
-
     echo "##### return $RETURN"
     if [ "$RETURN" = "$CODE" ] ; then
 	echo "##### ssh connection test returned as desired"