tweak some of the log output inconsequentially

[monkeysphere.git] / tests / basic

diff --git a/tests/basic b/tests/basic
index bcade42efead44942cdd5eec2303a8afcec9068e..9844454543b53d42f525e150ec5587b123c421af 100755 (executable)
--- a/tests/basic
+++ b/tests/basic
@@ -90,13 +90,16 @@ trap failed_cleanup EXIT
 ## set up some variables to ensure that we're operating strictly in
 ## the tests, not system-wide:
 
-# make temp dir
-# 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")
+# set up temp dir
+
+# NOTE: /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.  If you need to use a
+# different location than the current source, please set $TMPDIR
+# somewhere with tighter permissions.
+
+mkdir -p "$TESTDIR"/tmp
+TEMPDIR=$(mktemp -d "${TMPDIR:-$TESTDIR/tmp}/monkeyspheretest.XXXXXXX")
 
 # Use the local copy of executables first, instead of system ones.
 # This should help us test without installing.
@@ -171,7 +174,6 @@ monkeysphere-host expert import-key testhost < "$TEMPDIR"/ssh_host_rsa_key
 echo "##################################################"
 echo "### setting host key expiration..."
 monkeysphere-host set-expire 1
-monkeysphere-host show-key
 # FIXME: how do we check that the expiration has really been set?
 
 echo "##################################################"
@@ -212,8 +214,11 @@ echo "##################################################"
 echo "### adding admin as certifier..."
 monkeysphere-authentication add-id-certifier -y "$TEMPDIR"/admin/.gnupg/pubkey.gpg
 
-# FIXME: should we run "diagnostics" here to test setup?
+echo "##################################################"
+echo "### list certifiers..."
+monkeysphere-authentication list-certifiers
 
+# FIXME: should we run "diagnostics" here to test setup?
 
 ######################################################################
 ### TESTUSER SETUP