projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ef41243
)
simplified test to cope with possibility of re-ordered keytrans listfprs output
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Mon, 18 Jan 2010 16:54:33 +0000
(11:54 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Mon, 18 Jan 2010 16:58:03 +0000
(11:58 -0500)
tests/keytrans
patch
|
blob
|
history
diff --git
a/tests/keytrans
b/tests/keytrans
index 62aa4f262012544758a3e4fd4ba9d29438cd5e0a..411b42ec2b0c5cdc883a5530eb1f3d15c7c449e8 100755
(executable)
--- a/
tests/keytrans
+++ b/
tests/keytrans
@@
-180,8
+180,6
@@
NEWKEYID=$( printf "%s" "$NEWKEYFPR" | cut -b25-40)
PEM2OPENPGP_TIMESTAMP="$timestamp" \
keytrans adduserid "$KEYID" "baz" | gpg --import
PEM2OPENPGP_TIMESTAMP="$timestamp" \
keytrans adduserid "$KEYID" "baz" | gpg --import
-gpg --check-sigs --with-colons --fixed-list-mode
-
cat >"$TEMPDIR"/expectedout <<EOF
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
cat >"$TEMPDIR"/expectedout <<EOF
pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
@@
-199,21
+197,13
@@
EOF
echo "test: diff expected gpg list output"
diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
echo "test: diff expected gpg list output"
diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons --fixed-list-mode | grep -v ^tru)
-
ca
t >"$TEMPDIR"/expectedout <<EOF
+
sor
t >"$TEMPDIR"/expectedout <<EOF
$KEYFPR
$NEWKEYFPR
EOF
echo "test: diff expected keytrans listfpr output"
$KEYFPR
$NEWKEYFPR
EOF
echo "test: diff expected keytrans listfpr output"
-if ! diff -u "$TEMPDIR"/expectedout <( < "$TEMPDIR"/secring.gpg keytrans listfprs) ; then
- # test reverse order
- echo "test: diff test again with permuted order"
- cat >"$TEMPDIR"/expectedout <<EOF
-$NEWKEYFPR
-$KEYFPR
-EOF
- diff -u "$TEMPDIR"/expectedout <( < "$TEMPDIR"/secring.gpg keytrans listfprs)
-fi
+diff -u "$TEMPDIR"/expectedout <( < "$TEMPDIR"/secring.gpg keytrans listfprs | sort )
## FIXME: addtest: not testing subkeys at the moment.
## FIXME: addtest: not testing subkeys at the moment.