From: David Bremner <david@tethera.net>
Date: Wed, 27 Nov 2013 15:35:46 +0000 (+2000)
Subject: [PATCH] test/crypto: disable gpg version printing
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f4e05bc434c4ab199357ab16f40a6252e9901a2;p=notmuch-archives.git

[PATCH] test/crypto: disable gpg version printing
---

diff --git a/dd/a1f6795c0887fb68ff874bdabcbafd831afe7f b/dd/a1f6795c0887fb68ff874bdabcbafd831afe7f
new file mode 100644
index 000000000..1518d3731
--- /dev/null
+++ b/dd/a1f6795c0887fb68ff874bdabcbafd831afe7f
@@ -0,0 +1,106 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 92E09431E62
+	for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 07:36:04 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id Pbi-hDu5WCU0 for <notmuch@notmuchmail.org>;
+	Wed, 27 Nov 2013 07:35:58 -0800 (PST)
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
+	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id 430B2431FDB
+	for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 07:35:58 -0800 (PST)
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
+	(envelope-from <bremner@tesseract.cs.unb.ca>)
+	id 1Vlh9f-000851-Cy; Wed, 27 Nov 2013 11:35:55 -0400
+Received: (nullmailer pid 18901 invoked by uid 1000); Wed, 27 Nov 2013
+	15:35:51 -0000
+From: David Bremner <david@tethera.net>
+To: notmuch@notmuchmail.org
+Subject: [PATCH] test/crypto: disable gpg version printing
+Date: Wed, 27 Nov 2013 11:35:46 -0400
+Message-Id: <1385566546-18857-1-git-send-email-david@tethera.net>
+X-Mailer: git-send-email 1.8.4.3
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Wed, 27 Nov 2013 15:36:05 -0000
+
+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
+