X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=289a1b79997928c8b2edf8198bbd64c65e981856;hb=2e49fd875c65c99aef7c9f44e68a261c61859ec7;hp=259a7f0c192067326de061eb66579fb60d195e55;hpb=8d609df9ec376905dbed377c8b03a49ceca5efc5;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index 259a7f0..289a1b7 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:
+
+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,11 @@ 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