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

diff --git a/ef/26ccd399b9a8ebc1a4ea7910a75a1a5a53cff5 b/ef/26ccd399b9a8ebc1a4ea7910a75a1a5a53cff5
new file mode 100644 (file)
index 0000000..5a066b2
--- /dev/null
+++ b/ef/26ccd399b9a8ebc1a4ea7910a75a1a5a53cff5
@@ -0,0 +1,123 @@
+Return-Path: <tomi.ollila@iki.fi>\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 8E174431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 23:36:15 -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 4R5SadTdVXEs for <notmuch@notmuchmail.org>;\r
+       Wed, 27 Nov 2013 23:36:09 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 800A1431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Nov 2013 23:36:09 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 9FE3B10005E;\r
+       Thu, 28 Nov 2013 09:36:01 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test/crypto: disable gpg version printing\r
+In-Reply-To: <1385566546-18857-1-git-send-email-david@tethera.net>\r
+References: <1385566546-18857-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.16+175~g19e97d6 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Thu, 28 Nov 2013 09:36:01 +0200\r
+Message-ID: <m2ob550yhq.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\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: Thu, 28 Nov 2013 07:36:15 -0000\r
+\r
+On Wed, Nov 27 2013, David Bremner <david@tethera.net> wrote:\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
+W=C3=B6rks. +1\r
+\r
+Tomi\r
+\r
+\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
+>=20=20\r
+>  ##################################################\r
+> @@ -62,7 +63,7 @@ expected=3D'[[[{"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=3D'[[[{"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=3D'[[[{"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=3D'[[[{"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
+> --=20\r
+> 1.8.4.3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r