summaryrefslogtreecommitdiff
path: root/tests/basic
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-26 00:58:33 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-10-26 00:58:33 -0400
commita718b8d343f7b7de02be1a27a9f98a0ae52f0071 (patch)
treea3a4f28b33f635b28f3ccd0a67776ff56c0853cd /tests/basic
parent0461219ac31b04250dd7ea0630ef6da4c6bc1065 (diff)
testing: adding temporary monkeysphere config and ssh config.
Diffstat (limited to 'tests/basic')
-rwxr-xr-xtests/basic13
1 files changed, 10 insertions, 3 deletions
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 <<EOF > "$TEMPDIR"/testuser/.ssh/config
+UserKnownHosts $TEMPDIR/testuser/.ssh/known_hosts
+EOF
+
+cat <<EOF > "$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