X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Fnotmuch-test;h=5463cf218e403ef76a746d380a9f254e08a08864;hb=485678413ca988b9de84ae7110979599794c1739;hp=c1f1d26aacaa2a8f8335aca3280e789344cf9c1c;hpb=70b7e659f6744c0ef39536b023d99fa36a7fa76e;p=notmuch diff --git a/test/notmuch-test b/test/notmuch-test index c1f1d26a..5463cf21 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -64,6 +64,10 @@ increment_mtime () # Additional values for email headers. If these are not provided # then the relevant headers will simply not appear in the # message. +# +# '[id]=' +# +# Controls the message-id of the created message. gen_msg_cnt=0 gen_msg_filename="" gen_msg_id="" @@ -73,9 +77,14 @@ generate_message () local -A template="($@)" local additional_headers - gen_msg_cnt=$((gen_msg_cnt + 1)) - gen_msg_name=msg-$(printf "%03d" $gen_msg_cnt) - gen_msg_id="${gen_msg_name}@notmuch-test-suite" + if [ -z "${template[id]}" ]; then + gen_msg_cnt=$((gen_msg_cnt + 1)) + gen_msg_name=msg-$(printf "%03d" $gen_msg_cnt) + gen_msg_id="${gen_msg_name}@notmuch-test-suite" + else + gen_msg_name="msg-${template[id]}" + gen_msg_id="${template[id]}" + fi if [ -z "${template[dir]}" ]; then gen_msg_filename="${MAIL_DIR}/$gen_msg_name" @@ -346,7 +355,7 @@ execute_expecting "search thread:${thread_id}" "thread:XXX 2000-01-01 [1/1] No printf " Search body (phrase)...\t" add_message '[subject]="body search (phrase)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[body]="body search (phrase)"' add_message '[subject]="negative result"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[body]="This phrase should not match the body search"' -execute_expecting "search 'body search (phrase)'" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (phrase) (inbox unread)" +execute_expecting "search '\"body search (phrase)\"'" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (phrase) (inbox unread)" printf " Search by from: (address)...\t" add_message '[subject]="search by from (address)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' [from]=searchbyfrom@example.com @@ -367,7 +376,7 @@ execute_expecting "search to:'Search By To Name'" "thread:XXX 2000-01-01 [1/1] printf " Search by subject: (phrase)...\t" add_message '[subject]="subject search test (phrase)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' add_message '[subject]="this phrase should not match the subject search test"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' -execute_expecting "search subject:'subject search test (phrase)'" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subject search test (phrase) (inbox unread)" +execute_expecting "search 'subject:\"subject search test (phrase)\"'" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subject search test (phrase) (inbox unread)" printf "\nTesting \"notmuch reply\" in several variations:\n" @@ -383,7 +392,7 @@ Subject: Re: notmuch-reply-test To: Sender Bcc: test_suite@notmuchmail.org In-Reply-To: <${gen_msg_id}> -References: <${gen_msg_id}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > basic reply test" @@ -400,7 +409,7 @@ Subject: Re: notmuch-reply-test To: Sender , Someone Else Bcc: test_suite@notmuchmail.org In-Reply-To: <${gen_msg_id}> -References: <${gen_msg_id}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > Multiple recipients" @@ -419,7 +428,7 @@ To: Sender Cc: Other Parties Bcc: test_suite@notmuchmail.org In-Reply-To: <${gen_msg_id}> -References: <${gen_msg_id}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > reply with CC" @@ -436,7 +445,7 @@ Subject: Re: notmuch-reply-test To: Sender Bcc: test_suite@notmuchmail.org In-Reply-To: <${gen_msg_id}> -References: <${gen_msg_id}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > reply from alternate address" @@ -454,7 +463,7 @@ Subject: Re: notmuch-reply-test To: Sender Bcc: test_suite@notmuchmail.org In-Reply-To: <${gen_msg_id}> -References: <${gen_msg_id}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > support for reply-to" @@ -472,7 +481,7 @@ Subject: Re: notmuch-reply-test To: Sender , Some List Bcc: test_suite@notmuchmail.org In-Reply-To: <${gen_msg_id}> -References: <${gen_msg_id}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > Un-munging Reply-To" @@ -536,6 +545,23 @@ printf " Restore with nothing to do...\t" $NOTMUCH restore dump.expected echo " PASS" +printf "\nTesting threading when messages received out of order:\n" +printf " Adding initial child message...\t\t" +generate_message [body]=foo '[in-reply-to]=\' [subject]=brokenthreadtest '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' +execute_expecting new "Added 1 new message to the database." +printf " Searching returns the message...\t\t" +execute_expecting "search foo" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; brokenthreadtest (inbox unread)" +printf " Adding second child message...\t\t\t" +generate_message [body]=foo '[in-reply-to]=\' [subject]=brokenthreadtest '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' +execute_expecting new "Added 1 new message to the database." +printf " Searching returns both messages in one thread..." +execute_expecting "search foo" "thread:XXX 2000-01-01 [2/2] Notmuch Test Suite; brokenthreadtest (inbox unread)" +printf " Adding parent message...\t\t\t" +generate_message [body]=foo [id]=parent-id [subject]=brokenthreadtest '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' +execute_expecting new "Added 1 new message to the database." +printf " Searching returns all three messages in one thread..." +execute_expecting "search foo" "thread:XXX 2000-01-01 [3/3] Notmuch Test Suite; brokenthreadtest (inbox unread)" + cat <