tests now avoid prompting for default identity files.

diff --git a/tests/basic b/tests/basic
index 46ba63c1cda77e439f8dfaf9e741cc9d48c53976..3ec4a21657ca39acfbae7de30d38559f2e3806cb 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -23,6 +23,7 @@ launch_sshd() {
     socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
     export SSHD_PID=$!
 
     socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
     export SSHD_PID=$!
 

+    # wait until the socket is created before continuing

     while [ ! -S "$SOCKET" ] ; do
        sleep 1
     done
     while [ ! -S "$SOCKET" ] ; do
        sleep 1
     done


@@ -89,6 +90,7 @@ cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
 
 cat <<EOF >> "$TEMPDIR"/testuser/.ssh/config
 UserKnownHostsFile $TEMPDIR/testuser/.ssh/known_hosts
 
 cat <<EOF >> "$TEMPDIR"/testuser/.ssh/config
 UserKnownHostsFile $TEMPDIR/testuser/.ssh/known_hosts

+IdentityFile $TEMPDIR/testuser/.ssh/no-such-identity

 ProxyCommand $TEMPDIR/testuser/.ssh/proxy-command %h %p $SOCKET
 EOF
 
 ProxyCommand $TEMPDIR/testuser/.ssh/proxy-command %h %p $SOCKET
 EOF
 


@@ -187,8 +189,6 @@ launch_sshd
 
 # and make sure the user can no longer connect
 echo "### testuser attempting to connect to sshd socket..."
 
 # and make sure the user can no longer connect
 echo "### testuser attempting to connect to sshd socket..."

-# FIXME: this prompts for the passphrase for the default identity
-# file.  how can this be avoided?

 ssh_test || SSH_RETURN="$?"
 if [ "$SSH_RETURN" != '255' ] ; then
     exit
 ssh_test || SSH_RETURN="$?"
 if [ "$SSH_RETURN" != '255' ] ; then
     exit