summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-12 13:36:39 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-12 13:36:39 -0500
commit44ca5172d76fb84802c85057a3c0eaf0e6d8956d (patch)
treeab4d0913b43d08f33293f709fa59619b43c2c826
parent2be7543af6a883d1e08790a12ed3345f6519f15a (diff)
some clean up to tests/basic
-rwxr-xr-xtests/basic32
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/basic b/tests/basic
index d9399f0..bcade42 100755
--- a/tests/basic
+++ b/tests/basic
@@ -91,8 +91,12 @@ trap failed_cleanup EXIT
## the tests, not system-wide:
# make temp dir
-mkdir -p "$TESTDIR"/tmp
-TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX")
+# FIXME: I believe that /tmp can not be used as the temp dir here,
+# since the permissions on /tmp are usually such that they will not
+# pass the monkeysphere/ssh path permission checking. at least this
+# is my experience.
+#TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX")
+TEMPDIR=$(mktemp -d "${TESTDIR}/tmp/monkeyspheretest.XXXXXXX")
# Use the local copy of executables first, instead of system ones.
# This should help us test without installing.
@@ -121,10 +125,8 @@ export DISPLAY=monkeys
# copy in admin and testuser home to tmp
echo "##################################################"
-echo "### copying admin and testuser homes..."
-cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
+echo "### configuring testuser home..."
cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
-
# set up environment for testuser
export TESTHOME="$TEMPDIR"/testuser
export GNUPGHOME="$TESTHOME"/.gnupg
@@ -141,6 +143,10 @@ KNOWN_HOSTS=$TESTHOME/.ssh/known_hosts
EOF
get_gpg_prng_arg >> "$GNUPGHOME"/gpg.conf
+echo "##################################################"
+echo "### configuring admin home..."
+cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
+
# set up sshd
echo "##################################################"
echo "### configuring sshd..."
@@ -155,17 +161,6 @@ EOF
######################################################################
### SERVER HOST SETUP
-# create a new host key
-echo "##################################################"
-echo "### testing host key generation..."
-mkdir -p -m 750 "$MONKEYSPHERE_SYSDATADIR"/host
-# add gpg.conf with quick-random
-get_gpg_prng_arg >> "$MONKEYSPHERE_SYSCONFIGDIR"/host/gpg.conf
-echo | monkeysphere-host expert gen-key --length 1024 testhost
-
-# remove the host home for the next test
-rm -rf "$MONKEYSPHERE_SYSCONFIGDIR"/host
-
# import host key
echo "##################################################"
echo "### testing host key importing..."
@@ -182,6 +177,7 @@ monkeysphere-host show-key
echo "##################################################"
echo "### getting host key fingerprint..."
HOSTKEYID=$( monkeysphere-host show-key | grep '^OpenPGP fingerprint: ' | cut -f3 -d\ )
+echo "$HOSTKEYID"
# certify host key with the "Admin's Key".
# (this would normally be done via keyservers)
@@ -214,7 +210,7 @@ get_gpg_prng_arg >> "$MONKEYSPHERE_SYSDATADIR"/authentication/sphere/gpg.conf
# add admin as identity certifier for testhost
echo "##################################################"
echo "### adding admin as certifier..."
-echo y | monkeysphere-authentication add-id-certifier "$TEMPDIR"/admin/.gnupg/pubkey.gpg
+monkeysphere-authentication add-id-certifier -y "$TEMPDIR"/admin/.gnupg/pubkey.gpg
# FIXME: should we run "diagnostics" here to test setup?
@@ -241,6 +237,8 @@ gpg --export testuser | monkeysphere-authentication expert gpg-cmd --import
echo "##################################################"
echo "### update server authorized_keys file for this testuser..."
monkeysphere-authentication update-users $(whoami)
+# FIXME: NOT FAILING PROPERLY FOR:
+# ms: improper group or other writability on path '/tmp'.
######################################################################