Merge commit 'dkg/master'

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index 259a7f0c192067326de061eb66579fb60d195e55..d7355786457af1e996010733699e28a59e98bcaa 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -115,6 +115,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