summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/basic8
1 files changed, 2 insertions, 6 deletions
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"