The user still has to set NOTMUCH_TEST_SLOPPY --- test/from-guessing | 22 +++++++++++----------- test/multipart | 2 +- test/reply | 24 ++++++++++++------------ test/reply-to-sender | 24 ++++++++++++------------ 4 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/test/from-guessing b/test/from-guessing index 6dfaa40..bdda13b 100755 --- a/test/from-guessing +++ b/test/from-guessing @@ -9,7 +9,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -27,7 +27,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -45,7 +45,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -65,7 +65,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -85,7 +85,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -107,7 +107,7 @@ Received: from extraneous.example.com (extraneous.example.com [1.1.1.1])\"" \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output="$(notmuch reply id:${gen_msg_id})" +output="$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize)" test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -128,7 +128,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -146,7 +146,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -164,7 +164,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -184,7 +184,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -204,7 +204,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="from guessing test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] diff --git a/test/multipart b/test/multipart index b40fa2c..05a5f1d 100755 --- a/test/multipart +++ b/test/multipart @@ -569,7 +569,7 @@ test_expect_success \ "! notmuch show --format=mbox --part=1 'id:[email protected]'" test_begin_subtest "'notmuch reply' to a multipart message" -notmuch reply 'id:[email protected]' >OUTPUT +notmuch reply 'id:[email protected]' | notmuch_reply_sanitize >OUTPUT cat <<EOF >EXPECTED From: Notmuch Test Suite <[email protected]> Subject: Re: Multipart message diff --git a/test/reply b/test/reply index b0d854a..8929de0 100755 --- a/test/reply +++ b/test/reply @@ -9,7 +9,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="basic reply test"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -26,7 +26,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="Multiple recipients"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, Someone Else <[email protected]> @@ -44,7 +44,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply with CC"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -62,7 +62,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply from alternate address"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -80,7 +80,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="Reply from address in named group list"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, [email protected] @@ -98,7 +98,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="support for reply-to"' \ '[reply-to]="Sender <[email protected]>"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -116,7 +116,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="Un-munging Reply-To"' \ '[reply-to]="Evil Munging List <[email protected]>"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]>, Some List <[email protected]> @@ -130,7 +130,7 @@ test_begin_subtest "Message with header of exactly 200 bytes" 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"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="200-byte header"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: 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 @@ -149,7 +149,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="From guessing"' \ '[header]="Envelope-To: [email protected]"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: From guessing To: Sender <[email protected]>, Recipient <[email protected]> @@ -167,7 +167,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="From guessing"' \ '[header]="X-Original-To: [email protected]"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: From guessing To: Sender <[email protected]>, Recipient <[email protected]> @@ -185,7 +185,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="From guessing"' \ '[header]="Delivered-To: [email protected]"' -output=$(notmuch reply id:${gen_msg_id}) +output=$(notmuch reply id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: From guessing To: Sender <[email protected]>, Recipient <[email protected]> @@ -204,7 +204,7 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \ # 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') +output=$(notmuch reply id:${gen_msg_id} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge' | notmuch_reply_sanitize) test_expect_equal "$output" "\ From: Notmuch Test Suite <[email protected]> Subject: Re: =?iso-8859-1?b?4N/n?= diff --git a/test/reply-to-sender b/test/reply-to-sender index 30e5e38..194b2ae 100755 --- a/test/reply-to-sender +++ b/test/reply-to-sender @@ -9,7 +9,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="basic reply-to-sender test"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -26,7 +26,7 @@ add_message '[from]="Notmuch Test Suite <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="basic reply-to-from-us test"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Recipient <[email protected]> @@ -43,7 +43,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="Multiple recipients"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -60,7 +60,7 @@ add_message '[from]="Notmuch Test Suite <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="From Us, Multiple TO recipients"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Recipient <[email protected]>, Someone Else <[email protected]> @@ -78,7 +78,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply with CC"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -96,7 +96,7 @@ add_message '[from]="Notmuch Test Suite <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply with CC"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Recipient <[email protected]> @@ -113,7 +113,7 @@ add_message '[from]="Notmuch Test Suite <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply with CC"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test Cc: Other Parties <[email protected]> @@ -130,7 +130,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="reply from alternate address"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -148,7 +148,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="support for reply-to"' \ '[reply-to]="Sender <[email protected]>"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -166,7 +166,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="support for reply-to with multiple recipients"' \ '[reply-to]="Sender <[email protected]>"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -184,7 +184,7 @@ add_message '[from]="Sender <[email protected]>"' \ '[body]="Un-munging Reply-To"' \ '[reply-to]="Evil Munging List <[email protected]>"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: notmuch-reply-test To: Sender <[email protected]> @@ -198,7 +198,7 @@ test_begin_subtest "Message with header of exactly 200 bytes" 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"' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ '[body]="200-byte header"' -output=$(notmuch reply --reply-to=sender id:${gen_msg_id}) +output=$(notmuch reply --reply-to=sender id:${gen_msg_id} | notmuch_reply_sanitize) test_expect_equal "$output" "From: Notmuch Test Suite <[email protected]> Subject: Re: 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 -- 1.8.4.2 _______________________________________________ notmuch mailing list [email protected] http://notmuchmail.org/mailman/listinfo/notmuch
