Re: [PATCH] test: Canonicalize RFC 2047 encoding and charset

diff --git a/e4/be82bd17ff7d643c852b4c152db607b06d0bd2 b/e4/be82bd17ff7d643c852b4c152db607b06d0bd2
new file mode 100644 (file)
index 0000000..d171358
--- /dev/null
+++ b/e4/be82bd17ff7d643c852b4c152db607b06d0bd2
@@ -0,0 +1,107 @@
+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 56DC8431FDD\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 11:06:00 -0700 (PDT)\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 6wlJn2OD1Dlu for <notmuch@notmuchmail.org>;\r
+       Sun, 18 Aug 2013 11:05:54 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 04E2F431FDB\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 11:05:54 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 91A1F100086;\r
+       Sun, 18 Aug 2013 21:05:45 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: Canonicalize RFC 2047 encoding and charset\r
+In-Reply-To: <1376833926-6024-1-git-send-email-amdragon@mit.edu>\r
+References: <1376833926-6024-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.16+3~g340c058 (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: Sun, 18 Aug 2013 21:05:45 +0300\r
+Message-ID: <m238q698na.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 18 Aug 2013 18:06:00 -0000\r
+\r
+On Sun, Aug 18 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> RFC 2047 states that the encoding and charset in an encoded word are\r
+> case-insensitive, so force them to lower case in the reply test.  This\r
+> fixes an issue caused by GMime versions (somewhere between 2.6.10 and\r
+> 2.6.16), which changed the capitalization of the encoding.\r
+> ---\r
+>  test/reply |    8 +++++---\r
+>  1 file changed, 5 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/test/reply b/test/reply\r
+> index d4389cf..a078927 100755\r
+> --- a/test/reply\r
+> +++ b/test/reply\r
+> @@ -201,12 +201,14 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \\r
+>          '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+>          '[body]="Encoding"'\r
+>  \r
+> -output=$(notmuch reply id:${gen_msg_id})\r
+> -# Note that GMime changes from Q- to B-encoding\r
+> +# GMime happens to change from Q- to B-encoding.  We canonicalize the\r
+> +# case of the encoding and charset because different versions of GMime\r
+> +# capitalize the encoding differently.\r
+> +output=$(notmuch reply id:${gen_msg_id} | sed 's/=?[^?]*?[bB]?/\L&/g')\r
+\r
+The sed expression looks fancy enough to be GNU sed extension (\L& doing\r
+tolower to the matching part?). A more portable alternative could be: \r
+\r
+output=$(notmuch reply id:${gen_msg_id} | sed -e 's/?UTF-8?/?utf-8?/g' \\r
+                 -e 's/?ISO-88591-1?/?iso-88591-1?/g' -e 's/?B?/?b?/g')\r
+\r
+or alternatively (some bashism):\r
+\r
+output=$(notmuch reply id:${gen_msg_id})\r
+output=${output//\?UTF-8\?/?utf-8?}\r
+output=${output//\?ISO-8859-1\?/?iso-8859-1?}\r
+output=${output//\?B\?/?b?}\r
+\r
+\r
+Tomi\r
+\r
+\r
+>  test_expect_equal "$output" "\\r
+>  From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+>  Subject: Re: =?iso-8859-1?b?4N/n?=\r
+> -To: =?UTF-8?b?4piD?= <snowman@example.com>\r
+> +To: =?utf-8?b?4piD?= <snowman@example.com>\r
+>  In-Reply-To: <${gen_msg_id}>\r
+>  References: <${gen_msg_id}>\r
+>  \r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r