1 Return-Path: <bremner@tesseract.cs.unb.ca>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 92E09431E62
\r
6 for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 07:36:04 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Pbi-hDu5WCU0 for <notmuch@notmuchmail.org>;
\r
16 Wed, 27 Nov 2013 07:35:58 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 430B2431FDB
\r
21 for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 07:35:58 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tesseract.cs.unb.ca>)
\r
24 id 1Vlh9f-000851-Cy; Wed, 27 Nov 2013 11:35:55 -0400
\r
25 Received: (nullmailer pid 18901 invoked by uid 1000); Wed, 27 Nov 2013
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH] test/crypto: disable gpg version printing
\r
30 Date: Wed, 27 Nov 2013 11:35:46 -0400
\r
31 Message-Id: <1385566546-18857-1-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.4.3
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.13
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Wed, 27 Nov 2013 15:36:05 -0000
\r
47 This was causing test failures because version strings varied in
\r
48 length between GNU/Linux and GNU/KFreeBSD. One can also imagine
\r
49 different versions of gnupg causing the same failure.
\r
51 Thanks to dkg for the hints to find this bug.
\r
53 test/crypto | 9 +++++----
\r
54 1 file changed, 5 insertions(+), 4 deletions(-)
\r
56 diff --git a/test/crypto b/test/crypto
\r
57 index aa96ec2..9e5ff4f 100755
\r
60 @@ -19,6 +19,7 @@ add_gnupg_home ()
\r
61 elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
\r
62 echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
\r
64 + echo no-emit-version >> "$GNUPGHOME"/gpg.conf
\r
67 ##################################################
\r
68 @@ -62,7 +63,7 @@ expected='[[[{"id": "XXXXX",
\r
69 "content": "This is a test signed message.\n"},
\r
71 "content-type": "application/pgp-signature",
\r
72 - "content-length": 315}]}]},
\r
73 + "content-length": 280}]}]},
\r
75 test_expect_equal_json \
\r
77 @@ -97,7 +98,7 @@ expected='[[[{"id": "XXXXX",
\r
78 "content": "This is a test signed message.\n"},
\r
80 "content-type": "application/pgp-signature",
\r
81 - "content-length": 315}]}]},
\r
82 + "content-length": 280}]}]},
\r
84 test_expect_equal_json \
\r
86 @@ -130,7 +131,7 @@ expected='[[[{"id": "XXXXX",
\r
87 "content": "This is a test signed message.\n"},
\r
89 "content-type": "application/pgp-signature",
\r
90 - "content-length": 315}]}]},
\r
91 + "content-length": 280}]}]},
\r
93 test_expect_equal_json \
\r
95 @@ -354,7 +355,7 @@ expected='[[[{"id": "XXXXX",
\r
96 "content": "This is a test signed message.\n"},
\r
98 "content-type": "application/pgp-signature",
\r
99 - "content-length": 315}]}]},
\r
100 + "content-length": 280}]}]},
\r
102 test_expect_equal_json \
\r