set the bash pipefail option in the test script to return the error

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index c85b449506165630049912c5159b711871cd518e..d86388665492ba6e3336df8a8a2b4a478ef05a70 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -13,6 +13,14 @@
 
 # all subcommands in this script should complete without failure:
 set -e
+set -o pipefail
+
+## make sure that the right tools are installed to run the test.  the
+## test has *more* requirements than plain ol' monkeysphere:
+
+which socat || { echo "You must have socat installed to run this test." ; exit 1; }
+
+## FIXME: other checks?
 
 # gpg command for test admin user
 gpgadmin() {
@@ -115,6 +123,10 @@ export SSHD_CONFIG="$TEMPDIR"/sshd_config
 export SOCKET="$TEMPDIR"/ssh-socket
 export SSHD_PID=
 
+# Make sure $DISPLAY is set to convince ssh and monkeysphere to fall
+# back on $SSH_ASKPASS.  Make sure it's not set to the current actual
+# $DISPLAY (if one exists) because this test suite should not be doing
+# *anything* with any running X11 session.
 export DISPLAY=monkeys
 
 ### CONFIGURE ENVIRONMENTS