From e836e3d6f26d1c2bd03d70a4b37a6cce26ebb69f Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 25 Oct 2008 18:16:38 -0400
Subject: more work on test suite.
---
tests/basic | 17 +++++------------
tests/home/admin/.gnupg/pubring.gpg | Bin 4331 -> 5349 bytes
tests/home/admin/.gnupg/trustdb.gpg | Bin 1760 -> 1920 bytes
3 files changed, 5 insertions(+), 12 deletions(-)
(limited to 'tests')
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
Binary files a/tests/home/admin/.gnupg/pubring.gpg and b/tests/home/admin/.gnupg/pubring.gpg differ
diff --git a/tests/home/admin/.gnupg/trustdb.gpg b/tests/home/admin/.gnupg/trustdb.gpg
index 171a891..d46e25f 100644
Binary files a/tests/home/admin/.gnupg/trustdb.gpg and b/tests/home/admin/.gnupg/trustdb.gpg differ
--
cgit v1.2.3
From 9719b46f11c197187551241fee4bd6cd733e0b24 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 25 Oct 2008 18:48:32 -0400
Subject: more test suite fixes.
---
tests/basic | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'tests')
diff --git a/tests/basic b/tests/basic
index 83d6920..e97f998 100755
--- a/tests/basic
+++ b/tests/basic
@@ -15,10 +15,9 @@
# 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() {
- GNUPGHOME="$TESTDIR"/home/admin/.gnupg gpg "$@"
+ GNUPGHOME="$TEMPDIR"/admin/.gnupg gpg "$@"
}
# cleanup:
@@ -63,6 +62,12 @@ export MONKEYSPHERE_CHECK_KEYSERVER=false
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
@@ -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..."
-echo y | monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
+echo y | monkeysphere-server add-identity-certifier "$TEMPDIR"/admin/.gnupg/pubkey.gpg
# 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 &
-
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..."
--
cgit v1.2.3