From: Daniel Kahn Gillmor Date: Sat, 11 Jul 2009 23:06:22 +0000 (-0400) Subject: update keytrans test to produce more reasonable output X-Git-Tag: monkeysphere_0.25~24^2~1 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=b9b3b0e547c2f8650838146c1f41b4b521fb7efc;p=monkeysphere.git update keytrans test to produce more reasonable output --- diff --git a/tests/keytrans b/tests/keytrans index bad2ae3..ab95f59 100755 --- a/tests/keytrans +++ b/tests/keytrans @@ -17,7 +17,8 @@ set -e # piped commands should return the code of the first non-zero return set -o pipefail -export TESTDIR=$(dirname "$0") +# make sure the TESTDIR is an absolute path, not a relative one. +export TESTDIR=$(cd $(dirname "$0") && pwd) source "$TESTDIR"/common @@ -48,6 +49,14 @@ echo "##################################################" echo "### generating openpgp key..." export GNUPGHOME="$TEMPDIR" chmod 700 "$TEMPDIR" + + +# create the key with the same preferences that monkeysphere uses. +cat > "$TEMPDIR"/gpg.conf < \ "$TEMPDIR"/test.pem +gpg --export-secret-key > "$TEMPDIR"/secret.key + +PEM2OPENPGP_USAGE_FLAGS=sign,certify \ +PEM2OPENPGP_TIMESTAMP="$timestamp" pem2openpgp testtest \ + < "$TEMPDIR"/test.pem > "$TEMPDIR"/converted.secret.key + 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 ) + <(gpg --list-packets < "$TEMPDIR"/secret.key) \ + <(gpg --list-packets < "$TEMPDIR"/converted.secret.key) + +diff -u \ + <(hd "$TEMPDIR"/secret.key) \ + <(hd "$TEMPDIR"/converted.secret.key) trap - EXIT