From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH v2] test: Canonicalize RFC 2047 encoding and charset
Date: Mon, 19 Aug 2013 10:40:03 -0400
Message-Id: <1376923203-14406-1-git-send-email-amdragon@mit.edu>
In-Reply-To: <m238q698na.fsf@guru.guru-group.fi>
References: <m238q698na.fsf@guru.guru-group.fi>
Cc: tomi.ollila@iki.fi
Precedence: list

RFC 2047 states that the encoding and charset in an encoded word are
case-insensitive, so force them to lower case in the reply test.  This
fixes an issue caused by GMime versions (somewhere between 2.6.10 and
2.6.16), which changed the capitalization of the encoding.
---
 test/reply |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/reply b/test/reply
index d4389cf..b0d854a 100755
--- a/test/reply
+++ b/test/reply
@@ -201,12 +201,14 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \
 	    '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
 	    '[body]="Encoding"'
 
-output=$(notmuch reply id:${gen_msg_id})
-# Note that GMime changes from Q- to B-encoding
+# GMime happens to change from Q- to B-encoding.  We canonicalize the
+# case of the encoding and charset because different versions of GMime
+# capitalize the encoding differently.
+output=$(notmuch reply id:${gen_msg_id} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge')
 test_expect_equal "$output" "\
 From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: =?iso-8859-1?b?4N/n?=
-To: =?UTF-8?b?4piD?= <snowman@example.com>
+To: =?utf-8?b?4piD?= <snowman@example.com>
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
-- 
1.7.10.4