X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=8e7f88a2daf83d52aa57dcb57843d752e9660911;hb=2ae935a6dbd973730cd6e6aeb5cc5bbfc54949b5;hp=c85b449506165630049912c5159b711871cd518e;hpb=e4dbd96969a8e844b71a167238bc126d66155c31;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index c85b449..8e7f88a 100755
--- a/tests/basic
+++ b/tests/basic
@@ -14,6 +14,13 @@
 # all subcommands in this script should complete without failure:
 set -e
 
+## make sure that the right tools are installed to run the test.  the
+## test has *more* requirements than plain ol' monkeysphere:
+
+[ -x $(which socat) ] || { echo "You must have socat installed to run this test." && exit 1 }
+
+## FIXME: other checks?
+
 # gpg command for test admin user
 gpgadmin() {
     GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
@@ -115,6 +122,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