projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
testing: adding temporary monkeysphere config and ssh config.
[monkeysphere.git]
/
tests
/
basic
diff --git
a/tests/basic
b/tests/basic
index b1f3493c4aae90a446abb114599a3dacd3e40df8..23146840bf0e7288f8c0192e3cb3dafc7f60e337 100755
(executable)
--- 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"/
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
### 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}"
# 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