--- /dev/null
+Return-Path: <bremner@tethera.net>\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 1E663429E3E\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 19:15:59 -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 K-OVXdkpaAPR for <notmuch@notmuchmail.org>;\r
+ Sun, 10 Nov 2013 19:15:51 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 95A46431FDC\r
+ for <notmuch@notmuchmail.org>; Sun, 10 Nov 2013 19:15:51 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1Vfhyh-0003Ca-8x; Sun, 10 Nov 2013 23:15:51 -0400\r
+Received: (nullmailer pid 14513 invoked by uid 1000); Mon, 11 Nov 2013\r
+ 03:15:47 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 2/2] test: work around gmime bug using\r
+ notmuch_reply_sanitize\r
+Date: Sun, 10 Nov 2013 23:15:34 -0400\r
+Message-Id: <1384139734-14427-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.4.2\r
+In-Reply-To: <1384139734-14427-1-git-send-email-david@tethera.net>\r
+References: <1384100482-15453-3-git-send-email-david@tethera.net>\r
+ <1384139734-14427-1-git-send-email-david@tethera.net>\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, 11 Nov 2013 03:15:59 -0000\r
+\r
+The user still has to set NOTMUCH_TEST_WORKAROUNDS\r
+---\r
+ test/from-guessing | 22 +++++++++++-----------\r
+ test/multipart | 2 +-\r
+ test/reply | 24 ++++++++++++------------\r
+ test/reply-to-sender | 24 ++++++++++++------------\r
+ 4 files changed, 36 insertions(+), 36 deletions(-)\r
+\r
+diff --git a/test/from-guessing b/test/from-guessing\r
+index 6dfaa40..bdda13b 100755\r
+--- a/test/from-guessing\r
++++ b/test/from-guessing\r
+@@ -9,7 +9,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -27,7 +27,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -45,7 +45,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -65,7 +65,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -85,7 +85,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -107,7 +107,7 @@ Received: from extraneous.example.com (extraneous.example.com [1.1.1.1])\"" \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output="$(notmuch reply id:${gen_msg_id})"\r
++output="$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)"\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -128,7 +128,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -146,7 +146,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -164,7 +164,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -184,7 +184,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+@@ -204,7 +204,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="from guessing test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, mailinglist@notmuchmail.org\r
+diff --git a/test/multipart b/test/multipart\r
+index b40fa2c..05a5f1d 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -569,7 +569,7 @@ test_expect_success \\r
+ "! notmuch show --format=mbox --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org'"\r
+ \r
+ test_begin_subtest "'notmuch reply' to a multipart message"\r
+-notmuch reply 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT\r
++notmuch reply 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_reply_sanitize >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: Multipart message\r
+diff --git a/test/reply b/test/reply\r
+index b0d854a..8929de0 100755\r
+--- a/test/reply\r
++++ b/test/reply\r
+@@ -9,7 +9,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="basic reply test"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -26,7 +26,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="Multiple recipients"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, Someone Else <someone@example.com>\r
+@@ -44,7 +44,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="reply with CC"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -62,7 +62,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="reply from alternate address"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -80,7 +80,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="Reply from address in named group list"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, someone@example.com\r
+@@ -98,7 +98,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="support for reply-to"' \\r
+ '[reply-to]="Sender <elsewhere@example.com>"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <elsewhere@example.com>\r
+@@ -116,7 +116,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="Un-munging Reply-To"' \\r
+ '[reply-to]="Evil Munging List <list@example.com>"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>, Some List <list@example.com>\r
+@@ -130,7 +130,7 @@ test_begin_subtest "Message with header of exactly 200 bytes"\r
+ add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="200-byte header"'\r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: This subject is exactly 200 bytes in length. Other than its\r
+ length there is not much of note here. Note that the length of 200 bytes\r
+@@ -149,7 +149,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="From guessing"' \\r
+ '[header]="Envelope-To: test_suite_other@notmuchmail.org"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: From guessing\r
+ To: Sender <sender@example.com>, Recipient <recipient@example.com>\r
+@@ -167,7 +167,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="From guessing"' \\r
+ '[header]="X-Original-To: test_suite@otherdomain.org"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>\r
+ Subject: Re: From guessing\r
+ To: Sender <sender@example.com>, Recipient <recipient@example.com>\r
+@@ -185,7 +185,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="From guessing"' \\r
+ '[header]="Delivered-To: test_suite_other@notmuchmail.org"'\r
+ \r
+-output=$(notmuch reply id:${gen_msg_id})\r
++output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: From guessing\r
+ To: Sender <sender@example.com>, Recipient <recipient@example.com>\r
+@@ -204,7 +204,7 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \\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
++output=$(notmuch reply id:${gen_msg_id} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge' | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "\\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: =?iso-8859-1?b?4N/n?=\r
+diff --git a/test/reply-to-sender b/test/reply-to-sender\r
+index 30e5e38..194b2ae 100755\r
+--- a/test/reply-to-sender\r
++++ b/test/reply-to-sender\r
+@@ -9,7 +9,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="basic reply-to-sender test"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -26,7 +26,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="basic reply-to-from-us test"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Recipient <recipient@example.com>\r
+@@ -43,7 +43,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="Multiple recipients"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -60,7 +60,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="From Us, Multiple TO recipients"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Recipient <recipient@example.com>, Someone Else <someone@example.com>\r
+@@ -78,7 +78,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="reply with CC"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -96,7 +96,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="reply with CC"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Recipient <recipient@example.com>\r
+@@ -113,7 +113,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="reply with CC"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ Cc: Other Parties <cc@example.com>\r
+@@ -130,7 +130,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="reply from alternate address"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -148,7 +148,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="support for reply-to"' \\r
+ '[reply-to]="Sender <elsewhere@example.com>"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <elsewhere@example.com>\r
+@@ -166,7 +166,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="support for reply-to with multiple recipients"' \\r
+ '[reply-to]="Sender <elsewhere@example.com>"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <elsewhere@example.com>\r
+@@ -184,7 +184,7 @@ add_message '[from]="Sender <sender@example.com>"' \\r
+ '[body]="Un-munging Reply-To"' \\r
+ '[reply-to]="Evil Munging List <list@example.com>"'\r
+ \r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: notmuch-reply-test\r
+ To: Sender <sender@example.com>\r
+@@ -198,7 +198,7 @@ test_begin_subtest "Message with header of exactly 200 bytes"\r
+ add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \\r
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \\r
+ '[body]="200-byte header"'\r
+-output=$(notmuch reply --reply-to=sender id:${gen_msg_id})\r
++output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize)\r
+ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Subject: Re: This subject is exactly 200 bytes in length. Other than its\r
+ length there is not much of note here. Note that the length of 200 bytes\r
+-- \r
+1.8.4.2\r
+\r
projects / notmuch-archives.git / commitdiff