added comments and changelog notes about why the test script sets $DISPLAY

diff --git a/debian/changelog b/debian/changelog
index ebde5e443915ef82a05df57c4c884d1470952c46..f42b3d8fad6ba335c24006dfb53fcc3f22913aee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+monkeysphere (0.19-1) UNRELEASED; urgency=low
+
+  * simulating an X11 session in the test script.
+
+ --
+

 monkeysphere (0.18-1) experimental; urgency=low
 
   [ Jameson Graef Rollins ]
 monkeysphere (0.18-1) experimental; urgency=low
 
   [ Jameson Graef Rollins ]

diff --git a/tests/basic b/tests/basic
index c85b449506165630049912c5159b711871cd518e..d7355786457af1e996010733699e28a59e98bcaa 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -115,6 +115,10 @@ export SSHD_CONFIG="$TEMPDIR"/sshd_config
 export SOCKET="$TEMPDIR"/ssh-socket
 export SSHD_PID=
 
 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
 export DISPLAY=monkeys
 
 ### CONFIGURE ENVIRONMENTS