X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=af63d39afa011e4ba0bb9ba653523eb0061a1f5f;hp=835545a7b738f270652ed2645faa5f85895bc74a;hb=5c938e51b263a3697623c3f2cf3e6fe0244d351e;hpb=4e66b777cf819bc404ca08ad9d6ec26e00c52760 diff --git a/test/notmuch-test b/test/notmuch-test index 835545a7..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 @@ -58,6 +58,7 @@ increment_mtime () # be generated instead. # # '[cc]="Some User "' +# [reply-to]=some-address # [in-reply-to]= # # Additional values for email headers. If these are not provided @@ -104,8 +105,8 @@ generate_message () fi additional_headers="" - if [ ! -z "${template[cc]}" ]; then - additional_headers="Cc: ${template[cc]} + if [ ! -z "${template[reply-to]}" ]; then + additional_headers="Reply-To: ${template[reply-to]} ${additional_headers}" fi @@ -114,6 +115,11 @@ ${additional_headers}" ${additional_headers}" fi + if [ ! -z "${template[cc]}" ]; then + additional_headers="Cc: ${template[cc]} +${additional_headers}" + fi + cat <$gen_msg_filename From: ${template[from]} To: ${template[to]} @@ -128,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 () @@ -163,6 +180,7 @@ path=${MAIL_DIR} [user] name=Notmuch Test Suite primary_email=test_suite@notmuchmail.org +other_email=test_suite_other@notmuchmail.org EOF printf "Testing \"notmuch new\" in several variations:\n" @@ -296,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]=notmuch-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 @@ -311,7 +328,96 @@ In-Reply-To: <${gen_msg_id}> References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: -> notmuch-reply-test" +> basic reply test" + +printf " Multiple recipients...\t\t" +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"' + +execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +Subject: Re: notmuch-reply-test +To: Sender , Someone Else +Bcc: test_suite@notmuchmail.org +In-Reply-To: <${gen_msg_id}> +References: <${gen_msg_id}> + +On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: +> Multiple recipients" + +printf " Reply with CC...\t\t" +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"' + +execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +Subject: Re: notmuch-reply-test +To: Sender +Cc: Other Parties +Bcc: test_suite@notmuchmail.org +In-Reply-To: <${gen_msg_id}> +References: <${gen_msg_id}> + +On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: +> reply with CC" + +printf " 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"' + +execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +Subject: Re: notmuch-reply-test +To: Sender +Bcc: test_suite@notmuchmail.org +In-Reply-To: <${gen_msg_id}> +References: <${gen_msg_id}> + +On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: +> reply from alternate address" + +printf " Support for Reply-To...\t" +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 "' + +execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +Subject: Re: notmuch-reply-test +To: Sender +Bcc: test_suite@notmuchmail.org +In-Reply-To: <${gen_msg_id}> +References: <${gen_msg_id}> + +On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: +> support for reply-to" + +printf " Un-munging Reply-To...\t\t" +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 "' + +execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +Subject: Re: notmuch-reply-test +To: Sender , Some List +Bcc: test_suite@notmuchmail.org +In-Reply-To: <${gen_msg_id}> +References: <${gen_msg_id}> + +On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: +> Un-munging Reply-To" cat <