[PATCH] test/crypto: disable gpg version printing

David Bremner david at tethera.net
Wed Nov 27 07:35:46 PST 2013


This was causing test failures because version strings varied in
length between GNU/Linux and GNU/KFreeBSD. One can also imagine
different versions of gnupg causing the same failure.
---
Thanks to dkg for the hints to find this bug.

 test/crypto | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/crypto b/test/crypto
index aa96ec2..9e5ff4f 100755
--- a/test/crypto
+++ b/test/crypto
@@ -19,6 +19,7 @@ add_gnupg_home ()
     elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
 	echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
     fi
+    echo no-emit-version >> "$GNUPGHOME"/gpg.conf
 }
 
 ##################################################
@@ -62,7 +63,7 @@ expected='[[[{"id": "XXXXX",
  "content": "This is a test signed message.\n"},
  {"id": 3,
  "content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
  []]]]'
 test_expect_equal_json \
     "$output" \
@@ -97,7 +98,7 @@ expected='[[[{"id": "XXXXX",
  "content": "This is a test signed message.\n"},
  {"id": 3,
  "content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
  []]]]'
 test_expect_equal_json \
     "$output" \
@@ -130,7 +131,7 @@ expected='[[[{"id": "XXXXX",
  "content": "This is a test signed message.\n"},
  {"id": 3,
  "content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
  []]]]'
 test_expect_equal_json \
     "$output" \
@@ -354,7 +355,7 @@ expected='[[[{"id": "XXXXX",
  "content": "This is a test signed message.\n"},
  {"id": 3,
  "content-type": "application/pgp-signature",
- "content-length": 315}]}]},
+ "content-length": 280}]}]},
  []]]]'
 test_expect_equal_json \
     "$output" \
-- 
1.8.4.3



More information about the notmuch mailing list