summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-26 02:28:45 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-26 02:28:45 -0400
commitdeff162a515d6cbd4a657f62d8137c4e82ca7d30 (patch)
tree24974f058ef776738d99c5c70ec5aa318abd0dac /tests
parentc4a5813c6847201ae55ab8d3d49b6b4bb9691561 (diff)
testing: fixing some bash escaping, adding in one last FIXME
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/basic b/tests/basic
index 10b3c31..832b33a 100755
--- a/tests/basic
+++ b/tests/basic
@@ -126,6 +126,9 @@ HostKey ${MONKEYSPHERE_SYSDATADIR}/ssh_host_rsa_key
AuthorizedKeysFile ${MONKEYSPHERE_SYSDATADIR}/authorized_keys/%u
EOF
+# FIXME: teach the "server" about the testuser's key, and update the
+# fake authorized_keys file for testuser!
+
# launch test sshd with the new host key.
echo "### starting sshd..."
socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
@@ -150,7 +153,7 @@ gpgadmin --armor --export "$HOSTKEYID" | gpg --import
echo "### testuser connecting to sshd socket..."
ssh-agent bash -c \
- 'monkeysphere subkey-to-ssh-agent && ssh -F "$TEMPDIR"/testuser/.ssh/config testhost'
+ "monkeysphere subkey-to-ssh-agent && ssh -F $TEMPDIR/testuser/.ssh/config testhost"
trap - EXIT
cleanup