summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-10-25 18:16:38 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-10-25 18:16:38 -0400
commite836e3d6f26d1c2bd03d70a4b37a6cce26ebb69f (patch)
treed0be6063967e80837a1c9711eb841ebcb446dac3 /tests
parent6037a421c142502108ce9525c62cd0db4714ecdb (diff)
more work on test suite.
Diffstat (limited to 'tests')
-rwxr-xr-xtests/basic17
-rw-r--r--tests/home/admin/.gnupg/pubring.gpgbin4331 -> 5349 bytes
-rw-r--r--tests/home/admin/.gnupg/trustdb.gpgbin1760 -> 1920 bytes
3 files changed, 5 insertions, 12 deletions
diff --git a/tests/basic b/tests/basic
index 81f3b91..83d6920 100755
--- a/tests/basic
+++ b/tests/basic
@@ -24,17 +24,14 @@ gpgadmin() {
# cleanup:
cleanup() {
+ echo
read -p "press enter to cleanup and remove tmp:"
- # FIXME: stop the sshd process
+ echo "### stop sshd..."
+ kill "$SSHD_PID"
- echo
echo "### removing temp dir..."
rm -rf "$TEMPDIR"
-
- # FIXME: how should we clear out the temporary $VARLIB?
-
- # FIXME: clear out ssh client config file and known hosts.
}
## setup trap
@@ -96,9 +93,7 @@ echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
# FIXME: how can we test publish-key without flooding junk into the
# keyservers?
-# indicate that the "Admin's" key is an identity certifier for the
-# host
-
+# add admin as identity certifier for testhost
echo "### adding admin as certifier..."
echo y | monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
@@ -114,6 +109,7 @@ EOF
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
@@ -131,9 +127,6 @@ echo "### export server key to testuser..."
gpgadmin --armor --export "$HOSTKEYID" | \
GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --import
-#GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --list-keys
-#read -p "?"
-
# connect to test sshd, using monkeysphere to verify the identity
# before connection.
echo "### testuser connecting to sshd socket..."
diff --git a/tests/home/admin/.gnupg/pubring.gpg b/tests/home/admin/.gnupg/pubring.gpg
index 8e10c4a..d22babd 100644
--- a/tests/home/admin/.gnupg/pubring.gpg
+++ b/tests/home/admin/.gnupg/pubring.gpg
Binary files differ
diff --git a/tests/home/admin/.gnupg/trustdb.gpg b/tests/home/admin/.gnupg/trustdb.gpg
index 171a891..d46e25f 100644
--- a/tests/home/admin/.gnupg/trustdb.gpg
+++ b/tests/home/admin/.gnupg/trustdb.gpg
Binary files differ