testing: A bit more fine-tuning, so that the test suite should successfully complete...

diff --git a/tests/basic b/tests/basic
index 8d2b8f8768e2c25545626a368afc977a7d757446..2befac2ed5e6b43807588bac144ac76accaa287d 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -22,18 +22,16 @@ gpgadmin() {
 failed_cleanup() {
 # FIXME: can we be more verbose here?
   echo 'FAILED!'
+  read -p "press enter to cleanup and remove tmp:"
+
   cleanup
 }
 
 # cleanup:
 cleanup() {
-
-    echo
-    read -p "press enter to cleanup and remove tmp:"
-
-    if ( ps $SSHD_PID >/dev/null ) ; then 
+    if ( ps "$SSHD_PID" >/dev/null ) ; then 
        echo "### stopping still-running sshd..."
-       kill $SSHD_PID
+       kill "$SSHD_PID"
     fi
 
     echo "### removing temp dir..."
@@ -162,7 +160,12 @@ monkeysphere-server update-users "$USER"
 echo "### testuser connecting to sshd socket..."
 
 ssh-agent bash -c \
-   "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost"
+   "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost true"
 
 trap - EXIT
+
+echo
+echo "Monkeysphere basic tests completed successfully!"
+echo
+
 cleanup

diff --git a/tests/home/testuser/.ssh/proxy-command b/tests/home/testuser/.ssh/proxy-command
index 630327d0f8f4497f068642c7c86fe9d3d2a61097..21c66faaf7dc2e046c3198844a338cdbad1ea38f 100755 (executable)
--- a/tests/home/testuser/.ssh/proxy-command
+++ b/tests/home/testuser/.ssh/proxy-command
@@ -5,4 +5,4 @@
 # pass this thing the host, the port, and the socket.
 
 monkeysphere-ssh-proxycommand --no-connect "$1" "$2" && \
-socat STDIO UNIX:"$3"
+exec socat STDIO UNIX:"$3"