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

diff --git a/3c/3135ecaa1f9d0b7f3f41ee2b224f779e2a1658 b/3c/3135ecaa1f9d0b7f3f41ee2b224f779e2a1658
new file mode 100644 (file)
index 0000000..1a532f0
--- /dev/null
+++ b/3c/3135ecaa1f9d0b7f3f41ee2b224f779e2a1658
@@ -0,0 +1,103 @@
+Return-Path: <jani@nikula.org>\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 DE1D642117B\r
+       for <notmuch@notmuchmail.org>; Mon, 19 Aug 2013 08:13:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 sz2hheGvB6gv for <notmuch@notmuchmail.org>;\r
+       Mon, 19 Aug 2013 08:13:51 -0700 (PDT)\r
+Received: from mail-bk0-f47.google.com (mail-bk0-f47.google.com\r
+       [209.85.214.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 23B9D42117A\r
+       for <notmuch@notmuchmail.org>; Mon, 19 Aug 2013 08:13:51 -0700 (PDT)\r
+Received: by mail-bk0-f47.google.com with SMTP id mx12so1485608bkb.34\r
+       for <notmuch@notmuchmail.org>; Mon, 19 Aug 2013 08:13:49 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=yrsQtXqOZACEU6y81YdPlIth9aGeBZEnFt0RAVm+Ga8=;\r
+       b=UFb/1lLrLTS6Z5D2X8hS0YiVjsz9dm0QN0DG9yQ1E7Jit08uHK2kdQADdGHGWqFMfD\r
+       a//dyty2kOieeK9UKIV6af3h+H6cN5DUb6k1xujZdQJGJt3f5tP3/xI9gC8l5B0PCein\r
+       zDvhyNhGazvTp3s3PChURP/xXe7vxg05IF1Ue7dL6+p0VPt+GJot7iBLpC+UPD5vwB4z\r
+       qH/hN1iG5M/cpSPkr7p3xIpnqbExxQeK0cKglDgZKguUtGl6B00uL9zYx1uwvlwYjSeN\r
+       mhgQs4KWr22OZdLQU+5fDDvuovGGCZZCGzTZS2/OsrVrrbahRlERs8VjWAD0MrJcT9Vp\r
+       tung==\r
+X-Gm-Message-State:\r
+ ALoCoQnRar1UMdRPISAay3ZX5WlU8m04KM2VqmX4dUuadF0XoMYX8RuRdkZIbd25RjSDtnGXszG4\r
+X-Received: by 10.205.9.198 with SMTP id ox6mr8533818bkb.19.1376925229688;\r
+       Mon, 19 Aug 2013 08:13:49 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id m6sm1924145bki.7.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 19 Aug 2013 08:13:48 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, Austin Clements <amdragon@MIT.EDU>,\r
+       notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] test: Canonicalize RFC 2047 encoding and charset\r
+In-Reply-To: <m2txil3fng.fsf@guru.guru-group.fi>\r
+References: <m238q698na.fsf@guru.guru-group.fi>\r
+       <1376923203-14406-1-git-send-email-amdragon@mit.edu>\r
+       <m2txil3fng.fsf@guru.guru-group.fi>\r
+User-Agent: Notmuch/0.16+10~g791e68f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 19 Aug 2013 18:13:50 +0300\r
+Message-ID: <871u5pbtn5.fsf@nikula.org>\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: Mon, 19 Aug 2013 15:13:56 -0000\r
+\r
+On Mon, 19 Aug 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
+> On Mon, Aug 19 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..b0d854a 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} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge')\r
+>\r
+> LGTM.\r
+\r
+And the relevant test passes with this version too.\r
+\r
+Jani.\r
+\r