test: Update tests with removal of bcc from reply

Update the tests so that they no longer expect the Bcc header in the
output of "notmuch reply" now that it has been removed.

Edited-by Carl Worth: Simply applying the change to our newly
modularized test suite.

diff --git a/test/from-guessing b/test/from-guessing
index fab2007fdd2103fb5368a4685e79eef251128a40..8de543ffb2dc74344f0df57a36468b1e0d35cdb4 100755 (executable)
--- a/test/from-guessing
+++ b/test/from-guessing
@@ -13,7 +13,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -32,7 +31,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -51,7 +49,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -72,7 +69,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -93,7 +89,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -115,7 +110,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -134,7 +128,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -153,7 +146,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -174,7 +166,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -195,7 +186,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, mailinglist@notmuchmail.org

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 

diff --git a/test/reply b/test/reply
index 9f6442b7b8a38fc754fbb1067ac8e1f7e65e2167..99c337607ec9152720135aa82471fa7804d495bc 100755 (executable)
--- a/test/reply
+++ b/test/reply
@@ -13,7 +13,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -31,7 +30,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, Someone Else <someone@example.com>
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, Someone Else <someone@example.com>

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -51,7 +49,6 @@ test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.or
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
 Cc: Other Parties <cc@example.com>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
 Cc: Other Parties <cc@example.com>

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -69,7 +66,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -88,7 +84,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <elsewhere@example.com>
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <elsewhere@example.com>

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -107,7 +102,6 @@ output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, Some List <list@example.com>
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>, Some List <list@example.com>

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 


@@ -121,7 +115,6 @@ add_message '[subject]="This subject is exactly 200 bytes in length. Other than
 output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 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 includes the Subject: and Re: prefixes with two spaces
 output=$(notmuch reply id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 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 includes the Subject: and Re: prefixes with two spaces

-Bcc: test_suite@notmuchmail.org

 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>
 
 In-Reply-To: <${gen_msg_id}>
 References: <${gen_msg_id}>