X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fbasic;h=a04cc0ef367d78a27ba5355d164ca836a18a08c1;hb=485b28a03e3f53361a4084921b1d3c68c0fda968;hp=b1f3493c4aae90a446abb114599a3dacd3e40df8;hpb=0461219ac31b04250dd7ea0630ef6da4c6bc1065;p=monkeysphere.git

diff --git a/tests/basic b/tests/basic
index b1f3493..a04cc0e 100755
--- a/tests/basic
+++ b/tests/basic
@@ -26,11 +26,15 @@ cleanup() {
     echo
     read -p "press enter to cleanup and remove tmp:"
 
-    echo "### stop sshd..."
-    kill "$SSHD_PID"
+    if ( ps $SSHD_PID >/dev/null ) ; then 
+	echo "### stopping still-running sshd..."
+	kill $SSHD_PID
+    fi
 
     echo "### removing temp dir..."
     rm -rf "$TEMPDIR"
+
+    wait
 }
 
 ## setup trap
@@ -67,6 +71,13 @@ echo "### copying admin and testuser homes..."
 cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
 cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
 
+cat <<EOF > "$TEMPDIR"/testuser/.ssh/config
+UserKnownHostsFile $TEMPDIR/testuser/.ssh/known_hosts
+EOF
+
+cat <<EOF > "$TEMPDIR"/testuser/.monkeysphere/monkeysphere.conf
+KNOWN_HOSTS=$TEMPDIR/testuser/.ssh/known_hosts
+EOF
 
 
 ### SERVER TESTS
@@ -115,7 +126,6 @@ echo "### starting sshd..."
 socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -d -d -d -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
 export SSHD_PID=$!
 
-
 ### TESTUSER TESTS
 
 # generate an auth subkey for the test user
@@ -133,6 +143,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