From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 06:28:45 +0000 (-0400)
Subject: testing: fixing some bash escaping, adding in one last FIXME
X-Git-Tag: monkeysphere_0.16-1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=deff162a515d6cbd4a657f62d8137c4e82ca7d30;p=monkeysphere.git

testing: fixing some bash escaping, adding in one last FIXME
---

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