From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 29 Oct 2008 06:17:54 +0000 (-0400)
Subject: added comments and changelog notes about why the test script sets $DISPLAY
X-Git-Tag: monkeysphere_0.19-1~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37c5b03dbe70f8f3fe24d15318645e1678841879;p=monkeysphere.git

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

diff --git a/debian/changelog b/debian/changelog
index ebde5e4..f42b3d8 100644
--- 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 ]
diff --git a/tests/basic b/tests/basic
index c85b449..d735578 100755
--- a/tests/basic
+++ b/tests/basic
@@ -115,6 +115,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