diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-10-28 01:58:54 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-10-28 01:58:54 -0400 |
| commit | 34439fbc29dde4d946fa6542cf441655aed06f5e (patch) | |
| tree | b7c10a7aa28c063cac9e5866fd9cfb0b3c50f135 /tests/basic | |
| parent | 330cb7b513575a3d7e1956276b52ecd2cda25d95 (diff) | |
tests now avoid prompting for default identity files.
Diffstat (limited to 'tests/basic')
| -rwxr-xr-x | tests/basic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic b/tests/basic index 46ba63c..3ec4a21 100755 --- 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=$! + # wait until the socket is created before continuing 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 +IdentityFile $TEMPDIR/testuser/.ssh/no-such-identity 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..." -# 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 |