From: David Bremner <david@tethera.net>
Date: Wed, 27 Nov 2013 15:35:46 +0000 (-0400)
Subject: test/crypto: disable gpg version printing
X-Git-Tag: 0.17_rc2~3
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=456799d514473187758f51c0569b0676575db978

test/crypto: disable gpg version printing

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.
---

diff --git a/test/crypto b/test/crypto
index aa96ec22..9e5ff4f7 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" \