summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xtests/basic4
2 files changed, 10 insertions, 0 deletions
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