[PATCH] test/crypto: disable gpg version printing

diff --git a/dd/a1f6795c0887fb68ff874bdabcbafd831afe7f b/dd/a1f6795c0887fb68ff874bdabcbafd831afe7f
new file mode 100644 (file)
index 0000000..1518d37
--- /dev/null
+++ b/dd/a1f6795c0887fb68ff874bdabcbafd831afe7f
@@ -0,0 +1,106 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 92E09431E62\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 07:36:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id Pbi-hDu5WCU0 for <notmuch@notmuchmail.org>;\r
+       Wed, 27 Nov 2013 07:35:58 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 430B2431FDB\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 07:35:58 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Vlh9f-000851-Cy; Wed, 27 Nov 2013 11:35:55 -0400\r
+Received: (nullmailer pid 18901 invoked by uid 1000); Wed, 27 Nov 2013\r
+       15:35:51 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test/crypto: disable gpg version printing\r
+Date: Wed, 27 Nov 2013 11:35:46 -0400\r
+Message-Id: <1385566546-18857-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.4.3\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 27 Nov 2013 15:36:05 -0000\r
+\r
+This was causing test failures because version strings varied in\r
+length between GNU/Linux and GNU/KFreeBSD. One can also imagine\r
+different versions of gnupg causing the same failure.\r
+---\r
+Thanks to dkg for the hints to find this bug.\r
+\r
+ test/crypto | 9 +++++----\r
+ 1 file changed, 5 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/test/crypto b/test/crypto\r
+index aa96ec2..9e5ff4f 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -19,6 +19,7 @@ add_gnupg_home ()\r
+     elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then\r
+       echo debug-quick-random >> "$GNUPGHOME"/gpg.conf\r
+     fi\r
++    echo no-emit-version >> "$GNUPGHOME"/gpg.conf\r
+ }\r
+ \r
+ ##################################################\r
+@@ -62,7 +63,7 @@ expected='[[[{"id": "XXXXX",\r
+  "content": "This is a test signed message.\n"},\r
+  {"id": 3,\r
+  "content-type": "application/pgp-signature",\r
+- "content-length": 315}]}]},\r
++ "content-length": 280}]}]},\r
+  []]]]'\r
+ test_expect_equal_json \\r
+     "$output" \\r
+@@ -97,7 +98,7 @@ expected='[[[{"id": "XXXXX",\r
+  "content": "This is a test signed message.\n"},\r
+  {"id": 3,\r
+  "content-type": "application/pgp-signature",\r
+- "content-length": 315}]}]},\r
++ "content-length": 280}]}]},\r
+  []]]]'\r
+ test_expect_equal_json \\r
+     "$output" \\r
+@@ -130,7 +131,7 @@ expected='[[[{"id": "XXXXX",\r
+  "content": "This is a test signed message.\n"},\r
+  {"id": 3,\r
+  "content-type": "application/pgp-signature",\r
+- "content-length": 315}]}]},\r
++ "content-length": 280}]}]},\r
+  []]]]'\r
+ test_expect_equal_json \\r
+     "$output" \\r
+@@ -354,7 +355,7 @@ expected='[[[{"id": "XXXXX",\r
+  "content": "This is a test signed message.\n"},\r
+  {"id": 3,\r
+  "content-type": "application/pgp-signature",\r
+- "content-length": 315}]}]},\r
++ "content-length": 280}]}]},\r
+  []]]]'\r
+ test_expect_equal_json \\r
+     "$output" \\r
+-- \r
+1.8.4.3\r
+\r