X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=tests%2Fkeytrans;h=285d17bff711a6c998ca18e7aad3353b3b29cca4;hb=65e8a49c924eac3c46c93cb4bb9be9c739a58983;hp=262b6536b1306d7c31c4be73b1cf3a3a28c6671e;hpb=ee3660b61a72c0fd17f7841c1d0c67df6e9f9164;p=monkeysphere.git

diff --git a/tests/keytrans b/tests/keytrans
index 262b653..285d17b 100755
--- a/tests/keytrans
+++ b/tests/keytrans
@@ -40,21 +40,13 @@ mkdir -p "$TEMPDIR"
 
 # Use the local copy of executables first, instead of system ones.
 # This should help us test without installing.
-export PATH="$TESTDIR"/../src:"$TESTDIR"/../src/keytrans:"$PATH"
-
-export MONKEYSPHERE_SYSDATADIR="$TEMPDIR"
-export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR"
-export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share
-export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami)
-export MONKEYSPHERE_CHECK_KEYSERVER=false
-export MONKEYSPHERE_LOG_LEVEL=DEBUG
-
+export PATH="$TESTDIR"/../src/keytrans:"$PATH"
 
 ######################################################################
 ### TEST KEYTRANS
 
 echo "##################################################"
-echo "### test key conversion..."
+echo "### generating openpgp key..."
 export GNUPGHOME="$TEMPDIR"
 chmod 700 "$TEMPDIR"
 # generate a key
@@ -68,19 +60,29 @@ Expire-Date: 0
 %commit
 %echo done
 EOF
-# get the the key timestamp
+
+echo "##################################################"
+echo "### retrieving key timestamp..."
 timestamp=$(gpg --list-key --with-colons --fixed-list-mode | \
     grep ^pub: | cut -d: -f6)
-# export the key to a file
+
+echo "##################################################"
+echo "### exporting key to ssh file..."
 gpg --export-secret-key | openpgp2ssh > \
     "$TEMPDIR"/test.pem
-# reconvert key, and compare to key in gpg keyring
+
+echo "##################################################"
+echo "### reconvert key, and compare to key in gpg keyring..."
 diff -u \
     <(gpg --export-secret-key | hd) \
     <(PEM2OPENPGP_USAGE_FLAGS=sign,certify \
     PEM2OPENPGP_TIMESTAMP="$timestamp" pem2openpgp testtest < \
     "$TEMPDIR"/test.pem | hd )
 
-# clear out the temp dir
-rm -rf "$TEMPDIR"
-mkdir -p "$TEMPDIR"
+trap - EXIT
+
+echo "##################################################"
+echo " Monkeysphere keytrans test completed successfully!"
+echo "##################################################"
+
+cleanup