projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more test suite fixes.
[monkeysphere.git]
/
tests
/
basic
diff --git
a/tests/basic
b/tests/basic
index 83d69209d4265423d5c53048feed1fab56e51698..e97f998fc6f14fac2d5ea48776426d92e51032ad 100755
(executable)
--- a/
tests/basic
+++ b/
tests/basic
@@
-15,10
+15,9
@@
# fail on fail
set -e
# fail on fail
set -e
-# these tests assume a commonly-trusted "Admin's key", a fake key
-# permanently stored in ./home/admin/.gnupg:
+# gpg command for test admin user
gpgadmin() {
gpgadmin() {
- GNUPGHOME="$TE
STDIR"/home
/admin/.gnupg gpg "$@"
+ GNUPGHOME="$TE
MPDIR"
/admin/.gnupg gpg "$@"
}
# cleanup:
}
# cleanup:
@@
-63,6
+62,12
@@
export MONKEYSPHERE_CHECK_KEYSERVER=false
SSHD_CONFIG="$TEMPDIR"/sshd_config
export SOCKET="$TEMPDIR"/ssh-socket
SSHD_CONFIG="$TEMPDIR"/sshd_config
export SOCKET="$TEMPDIR"/ssh-socket
+# copy in admin and testuser home to tmp
+echo "### copying admin and testuser homes..."
+cp -r "$TESTDIR"/home/admin "$TEMPDIR"/
+cp -r "$TESTDIR"/home/testuser "$TEMPDIR"/
+
+
### SERVER TESTS
### SERVER TESTS
@@
-95,7
+100,7
@@
echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
# add admin as identity certifier for testhost
echo "### adding admin as certifier..."
# add admin as identity certifier for testhost
echo "### adding admin as certifier..."
-echo y | monkeysphere-server add-identity-certifier "$TE
STDIR"/home
/admin/.gnupg/pubkey.gpg
+echo y | monkeysphere-server add-identity-certifier "$TE
MPDIR"
/admin/.gnupg/pubkey.gpg
# initialize base sshd_config
cp etc/ssh/sshd_config "$SSHD_CONFIG"
# initialize base sshd_config
cp etc/ssh/sshd_config "$SSHD_CONFIG"
@@
-108,14
+113,10
@@
EOF
# launch test sshd with the new host key.
echo "### starting sshd..."
socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -d -d -d -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
# launch test sshd with the new host key.
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=$!
export SSHD_PID=$!
-### TESTUSER TESTS
-# copy testuser home directory into temp dir
-echo "### seting up testuser home..."
-cp -r "$TESTDIR"/home/testuser "$TEMPDIR"/
+### TESTUSER TESTS
# generate an auth subkey for the test user
echo "### generating key for testuser..."
# generate an auth subkey for the test user
echo "### generating key for testuser..."