From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Wed, 29 Oct 2008 05:38:39 +0000 (-0400)
Subject: set DISPLAY in test suite so that passphrase prompting falls through.
X-Git-Tag: monkeysphere_0.19-1~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=753b7c5f74caa99f31254b44fac62c313ecbb1db;p=monkeysphere.git

set DISPLAY in test suite so that passphrase prompting falls through.
---

diff --git a/src/common b/src/common
index 68a69e9..297e7f3 100644
--- a/src/common
+++ b/src/common
@@ -669,7 +669,7 @@ process_user_id() {
 		else
 		    log debug "  - unacceptable primary key."
 		    if [ -z "$sshKey" ] ; then
-			log error "   ! primary key could not be translated (not RSA or DSA?)."
+			log error "    ! primary key could not be translated (not RSA or DSA?)."
 		    else
 			echo "1:${sshKey}"
 		    fi
diff --git a/tests/basic b/tests/basic
index 259a7f0..c85b449 100755
--- a/tests/basic
+++ b/tests/basic
@@ -115,6 +115,7 @@ export SSHD_CONFIG="$TEMPDIR"/sshd_config
 export SOCKET="$TEMPDIR"/ssh-socket
 export SSHD_PID=
 
+export DISPLAY=monkeys
 
 ### CONFIGURE ENVIRONMENTS