summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-10-29 01:38:39 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-10-29 01:38:39 -0400
commit753b7c5f74caa99f31254b44fac62c313ecbb1db (patch)
treed87f002b81c8861546a5cc6bcf28c56ddbe58424
parent8d609df9ec376905dbed377c8b03a49ceca5efc5 (diff)
set DISPLAY in test suite so that passphrase prompting falls through.
-rw-r--r--src/common2
-rwxr-xr-xtests/basic1
2 files changed, 2 insertions, 1 deletions
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