From 5c938e51b263a3697623c3f2cf3e6fe0244d351e Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 4 Feb 2010 17:34:48 -0800 Subject: [PATCH] notmuch-test: Add a new add_message function. The previous generate_message function is what's needed when testing "notmuch new". But after that, we never want to generate a message without also adding it to the index. So create a new add_message function with this convenience. --- test/notmuch-test | 87 +++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/test/notmuch-test b/test/notmuch-test index 33218d24..af63d39a 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -29,8 +29,8 @@ increment_mtime () touch -d "+${increment_mtime_amount} seconds" $dir } -# Generate a new message in the mail directory, with -# a unique message ID and subject. +# Generate a new message in the mail directory, with a unique message +# ID and subject. The message is not added to the index. # # After this function returns, the filename of the generated message # is available as $gen_msg_filename and the message ID is available as @@ -134,6 +134,17 @@ EOF increment_mtime $(dirname ${gen_msg_filename}) } +# Generate a new message and add it to the index. +# +# All of the arguments and return values supported by generate_message +# are alos supported here, so see that function for details. +add_message () +{ + generate_message "$@" + + $NOTMUCH new > /dev/null +} + NOTMUCH_IGNORED_OUTPUT_REGEXP='^Processed [0-9]*( total)? file|Found [0-9]* total file' execute_expecting () @@ -303,13 +314,12 @@ execute_expecting new "No new mail. Removed 3 messages." printf "\nTesting \"notmuch reply\" in several variations:\n" printf " Basic reply...\t\t\t" -generate_message '[from]="Sender "' \ - [to]=test_suite@notmuchmail.org \ - [subject]=notmuch-reply-test \ - '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ - '[body]="basic reply test"' +add_message '[from]="Sender "' \ + [to]=test_suite@notmuchmail.org \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ + '[body]="basic reply test"' -$NOTMUCH new > /dev/null execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -321,13 +331,12 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > basic reply test" printf " Multiple recipients...\t\t" -generate_message '[from]="Sender "' \ - '[to]="test_suite@notmuchmail.org, Someone Else "' \ - [subject]=notmuch-reply-test \ - '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ - '[body]="Multiple recipients"' +add_message '[from]="Sender "' \ + '[to]="test_suite@notmuchmail.org, Someone Else "' \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ + '[body]="Multiple recipients"' -$NOTMUCH new > /dev/null execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender , Someone Else @@ -339,14 +348,13 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > Multiple recipients" printf " Reply with CC...\t\t" -generate_message '[from]="Sender "' \ - [to]=test_suite@notmuchmail.org \ - '[cc]="Other Parties "' \ - [subject]=notmuch-reply-test \ - '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ - '[body]="reply with CC"' +add_message '[from]="Sender "' \ + [to]=test_suite@notmuchmail.org \ + '[cc]="Other Parties "' \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ + '[body]="reply with CC"' -$NOTMUCH new > /dev/null execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -359,13 +367,12 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > reply with CC" printf " Reply from alternate address..." -generate_message '[from]="Sender "' \ - [to]=test_suite_other@notmuchmail.org \ - [subject]=notmuch-reply-test \ - '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ - '[body]="reply from alternate address"' +add_message '[from]="Sender "' \ + [to]=test_suite_other@notmuchmail.org \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ + '[body]="reply from alternate address"' -$NOTMUCH new > /dev/null execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -377,14 +384,13 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > reply from alternate address" printf " Support for Reply-To...\t" -generate_message '[from]="Sender "' \ - [to]=test_suite@notmuchmail.org \ - [subject]=notmuch-reply-test \ - '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ - '[body]="support for reply-to"' \ - '[reply-to]="Sender "' +add_message '[from]="Sender "' \ + [to]=test_suite@notmuchmail.org \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ + '[body]="support for reply-to"' \ + '[reply-to]="Sender "' -$NOTMUCH new > /dev/null execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender @@ -396,14 +402,13 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > support for reply-to" printf " Un-munging Reply-To...\t\t" -generate_message '[from]="Sender "' \ - '[to]="Some List "' \ - [subject]=notmuch-reply-test \ - '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ - '[body]="Un-munging Reply-To"' \ - '[reply-to]="Evil Munging List "' +add_message '[from]="Sender "' \ + '[to]="Some List "' \ + [subject]=notmuch-reply-test \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ + '[body]="Un-munging Reply-To"' \ + '[reply-to]="Evil Munging List "' -$NOTMUCH new > /dev/null execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite Subject: Re: notmuch-reply-test To: Sender , Some List -- 2.26.2