From e41cd1c518d7c5af565d4bed284bbd8a66366da1 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 19 Aug 2013 10:40:03 -0400 Subject: [PATCH] test: Canonicalize RFC 2047 encoding and charset 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 d4389cf5..b0d854a1 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 Subject: Re: =?iso-8859-1?b?4N/n?= -To: =?UTF-8?b?4piD?= +To: =?utf-8?b?4piD?= In-Reply-To: <${gen_msg_id}> References: <${gen_msg_id}>