X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fbasic;h=23146840bf0e7288f8c0192e3cb3dafc7f60e337;hb=a718b8d343f7b7de02be1a27a9f98a0ae52f0071;hp=b1f3493c4aae90a446abb114599a3dacd3e40df8;hpb=0461219ac31b04250dd7ea0630ef6da4c6bc1065;p=monkeysphere.git diff --git a/tests/basic b/tests/basic index b1f3493..2314684 100755 --- a/tests/basic +++ b/tests/basic @@ -67,6 +67,13 @@ echo "### copying admin and testuser homes..." cp -a "$TESTDIR"/home/admin "$TEMPDIR"/ cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/ +cat < "$TEMPDIR"/testuser/.ssh/config +UserKnownHosts $TEMPDIR/testuser/.ssh/known_hosts +EOF + +cat < "$TEMPDIR"/testuser/.monkeysphere/monkeysphere.conf +KNOWN_HOSTS=$TEMPDIR/testuser/.ssh/known_hosts +EOF ### SERVER TESTS @@ -133,6 +140,6 @@ gpgadmin --armor --export "$HOSTKEYID" | \ # the identity before connection. This should work in both directions! echo "### testuser connecting to sshd socket..." PROXY_COMMAND="monkeysphere-ssh-proxycommand --no-connect %h && socat STDIO UNIX:${SOCKET}" -GNUPGHOME="$TEMPDIR"/testuser/.gnupg ssh -v -v -v -oProxyCommand="$PROXY_COMMAND" testhost - - +GNUPGHOME="$TEMPDIR"/testuser/.gnupg \ +MONKEYSPHERE_HOME="$TEMPDIR"/testuser/.monkeysphere \ + ssh -F "$TEMPDIR"/testuser/.ssh/config -v -v -v -oProxyCommand="$PROXY_COMMAND" testhost