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

diff --git a/tests/basic b/tests/basic
index 10b3c3112173e19b60aed8e9dfd74bd2354a2647..832b33a69836a5ba5410ed1b3a8d93a8468c9f93 100755 (executable)
--- 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