X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=2a2c2e5fcd1a114e1c39dc31d18d6c710b586e54;hp=2e5eb2458617c2fbb5c6babc03a1e5857afba588;hb=004ed3362f7cbc46a118faf6c380da1bc5bd3f78;hpb=ef8a74944c41f7599d9de6c73f462dfd122ec0fe diff --git a/test/notmuch-test b/test/notmuch-test index 2e5eb245..2a2c2e5f 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" @@ -85,7 +94,7 @@ generate_message () fi if [ -z "${template[body]}" ]; then - template[body]="This is just a test message at ${gen_msg_filename}" + template[body]="This is just test message (#${gen_msg_cnt})" fi if [ -z "${template[from]}" ]; then @@ -97,11 +106,11 @@ generate_message () fi if [ -z "${template[subject]}" ]; then - template[subject]="Test message ${gen_msg_filename}" + template[subject]="Test message #${gen_msg_cnt}" fi if [ -z "${template[date]}" ]; then - template[date]="Tue, 05 Jan 2010 15:43:57 -0800" + template[date]="Tue, 05 Jan 2001 15:43:57 -0800" fi additional_headers="" @@ -145,14 +154,11 @@ add_message () $NOTMUCH new > /dev/null } -NOTMUCH_IGNORED_OUTPUT_REGEXP='^Processed [0-9]*( total)? file|Found [0-9]* total file' -NOTMUCH_THREAD_ID_SQUELCH='s/thread:................................/thread:XXX/' -execute_expecting () +pass_if_equal () { - args=$1 + output=$1 expected=$2 - output=$($NOTMUCH $args | grep -v -E -e "$NOTMUCH_IGNORED_OUTPUT_REGEXP" | sed -e "$NOTMUCH_THREAD_ID_SQUELCH" || true) if [ "$output" = "$expected" ]; then echo " PASS" else @@ -167,6 +173,17 @@ MAIL_DIR=${TEST_DIR}/mail export NOTMUCH_CONFIG=${TEST_DIR}/notmuch-config NOTMUCH=$(find_notmuch_binary $(pwd)) +NOTMUCH_NEW () +{ + $NOTMUCH new | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]* total file' +} + +NOTMUCH_SEARCH_THREAD_ID_SQUELCH='s/thread:................/thread:XXX/' +notmuch_search_sanitize () +{ + sed -e "$NOTMUCH_SEARCH_THREAD_ID_SQUELCH" +} + rm -rf ${TEST_DIR} mkdir ${TEST_DIR} cd ${TEST_DIR} @@ -184,39 +201,45 @@ other_email=test_suite_other@notmuchmail.org EOF printf "Testing \"notmuch new\" in several variations:\n" -printf " No new messages...\t\t" -execute_expecting new "No new mail." +printf " No new messages...\t\t\t\t" +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail." -printf " Single new message...\t\t" +printf " Single new message...\t\t\t\t" generate_message -execute_expecting new "Added 1 new message to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." -printf " Multiple new messages...\t" +printf " Multiple new messages...\t\t\t" generate_message generate_message -execute_expecting new "Added 2 new messages to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 2 new messages to the database." -printf " No new messages (non-empty DB)... " -execute_expecting new "No new mail." +printf " No new messages (non-empty DB)...\t\t" +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail." -printf " New directories...\t\t" +printf " New directories...\t\t\t\t" rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch mkdir ${MAIL_DIR}/def mkdir ${MAIL_DIR}/ghi generate_message [dir]=def -execute_expecting new "Added 1 new message to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." -printf " Alternate inode order...\t" +printf " Alternate inode order...\t\t\t" rm -rf ${MAIL_DIR}/.notmuch mv ${MAIL_DIR}/ghi ${MAIL_DIR}/abc rm ${MAIL_DIR}/def/* generate_message [dir]=abc -execute_expecting new "Added 1 new message to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." -printf " Message moved in...\t\t" +printf " Message moved in...\t\t\t\t" rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch generate_message tmp_msg_filename=tmp/$gen_msg_filename @@ -226,23 +249,26 @@ increment_mtime ${MAIL_DIR} $NOTMUCH new > /dev/null mv $tmp_msg_filename $gen_msg_filename increment_mtime ${MAIL_DIR} -execute_expecting new "Added 1 new message to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." -printf " Renamed message...\t\t" +printf " Renamed message...\t\t\t\t" generate_message $NOTMUCH new > /dev/null mv $gen_msg_filename ${gen_msg_filename}-renamed increment_mtime ${MAIL_DIR} -execute_expecting new "No new mail. Detected 1 file rename." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail. Detected 1 file rename." -printf " Deleted message...\t\t" +printf " Deleted message...\t\t\t\t" rm ${gen_msg_filename}-renamed increment_mtime ${MAIL_DIR} -execute_expecting new "No new mail. Removed 1 message." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail. Removed 1 message." -printf " Renamed directory...\t\t" +printf " Renamed directory...\t\t\t\t" generate_message [dir]=dir generate_message [dir]=dir @@ -253,31 +279,35 @@ $NOTMUCH new > /dev/null mv ${MAIL_DIR}/dir ${MAIL_DIR}/dir-renamed increment_mtime ${MAIL_DIR} -execute_expecting new "No new mail. Detected 3 file renames." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail. Detected 3 file renames." -printf " Deleted directory...\t\t" +printf " Deleted directory...\t\t\t\t" rm -rf ${MAIL_DIR}/dir-renamed increment_mtime ${MAIL_DIR} -execute_expecting new "No new mail. Removed 3 messages." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail. Removed 3 messages." -printf " New directory (at end of list)... " +printf " New directory (at end of list)...\t\t" generate_message [dir]=zzz generate_message [dir]=zzz generate_message [dir]=zzz -execute_expecting new "Added 3 new messages to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 3 new messages to the database." -printf " Deleted directory (end of list)... " +printf " Deleted directory (end of list)...\t\t" rm -rf ${MAIL_DIR}/zzz increment_mtime ${MAIL_DIR} -execute_expecting new "No new mail. Removed 3 messages." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail. Removed 3 messages." -printf " New symlink to directory...\t" +printf " New symlink to directory...\t\t\t" rm -rf ${MAIL_DIR}/.notmuch mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir @@ -285,125 +315,166 @@ mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir mkdir ${MAIL_DIR} ln -s ${TEST_DIR}/actual_maildir ${MAIL_DIR}/symlink -execute_expecting new "Added 1 new message to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." -printf " New symlink to a file...\t" +printf " New symlink to a file...\t\t\t" generate_message external_msg_filename=${TEST_DIR}/external/$(basename $gen_msg_filename) mkdir -p $(dirname $external_msg_filename) mv $gen_msg_filename $external_msg_filename ln -s $external_msg_filename $gen_msg_filename increment_mtime ${MAIL_DIR} -execute_expecting new "Added 1 new message to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." -printf " New two-level directory...\t" +printf " New two-level directory...\t\t\t" generate_message [dir]=two/levels generate_message [dir]=two/levels generate_message [dir]=two/levels -execute_expecting new "Added 3 new messages to the database." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 3 new messages to the database." -printf " Deleted two-level directory... " +printf " Deleted two-level directory...\t\t\t" rm -rf ${MAIL_DIR}/two increment_mtime ${MAIL_DIR} -execute_expecting new "No new mail. Removed 3 messages." +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "No new mail. Removed 3 messages." printf "\nTesting \"notmuch search\" in several variations:\n" -printf " Search body...\t\t\t" +printf " Search body...\t\t\t\t\t" add_message '[subject]="body search"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' [body]=bodysearchtest -execute_expecting "search bodysearchtest" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (inbox unread)" +output=$($NOTMUCH search bodysearchtest | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (inbox unread)" -printf " Search by from:...\t\t" +printf " Search by from:...\t\t\t\t" add_message '[subject]="search by from"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' [from]=searchbyfrom -execute_expecting "search from:searchbyfrom" "thread:XXX 2000-01-01 [1/1] searchbyfrom; search by from (inbox unread)" +output=$($NOTMUCH search from:searchbyfrom | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] searchbyfrom; search by from (inbox unread)" -printf " Search by to:...\t\t" +printf " Search by to:...\t\t\t\t" add_message '[subject]="search by to"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' [to]=searchbyto -execute_expecting "search to:searchbyto" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (inbox unread)" +output=$($NOTMUCH search to:searchbyto | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (inbox unread)" -printf " Search by subject:...\t\t" +printf " Search by subject:...\t\t\t\t" add_message [subject]=subjectsearchtest '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' -execute_expecting "search subject:subjectsearchtest" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subjectsearchtest (inbox unread)" +output=$($NOTMUCH search subject:subjectsearchtest | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subjectsearchtest (inbox unread)" -printf " Search by id:...\t\t" +printf " Search by id:...\t\t\t\t" add_message '[subject]="search by id"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' -execute_expecting "search id:${gen_msg_id}" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by id (inbox unread)" +output=$($NOTMUCH search id:${gen_msg_id} | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by id (inbox unread)" -printf " Search by tag:...\t\t" +printf " Search by tag:...\t\t\t\t" add_message '[subject]="search by tag"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' $NOTMUCH tag +searchbytag id:${gen_msg_id} -execute_expecting "search tag:searchbytag" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by tag (inbox searchbytag unread)" +output=$($NOTMUCH search tag:searchbytag | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by tag (inbox searchbytag unread)" -printf " Search by thread:...\t\t" +printf " Search by thread:...\t\t\t\t" add_message '[subject]="search by thread"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' thread_id=$($NOTMUCH search id:${gen_msg_id} | sed -e 's/thread:\([a-f0-9]*\).*/\1/') -execute_expecting "search thread:${thread_id}" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by thread (inbox unread)" +output=$($NOTMUCH search thread:${thread_id} | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by thread (inbox unread)" -printf " Search body (phrase)...\t" +printf " Search body (phrase)...\t\t\t" add_message '[subject]="body search (phrase)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[body]="body search (phrase)"' -execute_expecting "search 'body search (phrase)'" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (phrase) (inbox unread)" +add_message '[subject]="negative result"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[body]="This phrase should not match the body search"' +output=$($NOTMUCH search '\"body search (phrase)\"' | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (phrase) (inbox unread)" -printf " Search by from: (address)...\t" +printf " Search by from: (address)...\t\t\t" add_message '[subject]="search by from (address)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' [from]=searchbyfrom@example.com -execute_expecting "search from:searchbyfrom@example.com" "thread:XXX 2000-01-01 [1/1] searchbyfrom@example.com; search by from (address) (inbox unread)" +output=$($NOTMUCH search from:searchbyfrom@example.com | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] searchbyfrom@example.com; search by from (address) (inbox unread)" -printf " Search by from: (name)...\t" +printf " Search by from: (name)...\t\t\t" add_message '[subject]="search by from (name)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[from]="Search By From Name "' -execute_expecting "search from:'Search By From Name'" "thread:XXX 2000-01-01 [1/1] Search By From Name; search by from (name) (inbox unread)" +output=$($NOTMUCH search from:'Search By From Name' | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Search By From Name; search by from (name) (inbox unread)" -printf " Search by to: (address)...\t" +printf " Search by to: (address)...\t\t\t" add_message '[subject]="search by to (address)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' [to]=searchbyto@example.com -execute_expecting "search to:searchbyto@example.com" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (address) (inbox unread)" +output=$($NOTMUCH search to:searchbyto@example.com | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (address) (inbox unread)" -printf " Search by to: (name)...\t" +printf " Search by to: (name)...\t\t\t" add_message '[subject]="search by to (name)"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' '[to]="Search By To Name "' -execute_expecting "search to:'Search By To Name'" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" +output=$($NOTMUCH search to:'Search By To Name' | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread)" -printf " Search by subject: (phrase)...\t" +printf " Search by subject: (phrase)...\t\t\t" add_message '[subject]="subject search test (phrase)"' '[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)" +add_message '[subject]="this phrase should not match the subject search test"' '[date]="Sat, 01 Jan 2000 12:00:00 -0000"' +output=$($NOTMUCH search 'subject:\"subject search test (phrase)\"' | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subject search test (phrase) (inbox unread)" + +printf " Search for all messages (\"*\"):...\t\t" +output=$($NOTMUCH search '*' | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Test message #6 (inbox unread) +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Test message #14 (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (inbox unread) +thread:XXX 2000-01-01 [1/1] searchbyfrom; search by from (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subjectsearchtest (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by id (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by tag (inbox searchbytag unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by thread (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; body search (phrase) (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; negative result (inbox unread) +thread:XXX 2000-01-01 [1/1] searchbyfrom@example.com; search by from (address) (inbox unread) +thread:XXX 2000-01-01 [1/1] Search By From Name; search by from (name) (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (address) (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; search by to (name) (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; subject search test (phrase) (inbox unread) +thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; this phrase should not match the subject search test (inbox unread)" printf "\nTesting \"notmuch reply\" in several variations:\n" -printf " Basic reply...\t\t\t" +printf " Basic reply...\t\t\t\t\t" 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"' -execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +output=$($NOTMUCH reply id:${gen_msg_id}) +pass_if_equal "$output" "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}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > basic reply test" -printf " Multiple recipients...\t\t" +printf " Multiple recipients...\t\t\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 +output=$($NOTMUCH reply id:${gen_msg_id}) +pass_if_equal "$output" "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}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > Multiple recipients" -printf " Reply with CC...\t\t" +printf " Reply with CC...\t\t\t\t" add_message '[from]="Sender "' \ [to]=test_suite@notmuchmail.org \ '[cc]="Other Parties "' \ @@ -411,35 +482,37 @@ add_message '[from]="Sender "' \ '[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \ '[body]="reply with CC"' -execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +output=$($NOTMUCH reply id:${gen_msg_id}) +pass_if_equal "$output" "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}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > reply with CC" -printf " Reply from alternate address..." +printf " Reply from alternate address...\t\t" 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 +output=$($NOTMUCH reply id:${gen_msg_id}) +pass_if_equal "$output" "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}> +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" +printf " Support for Reply-To...\t\t\t" add_message '[from]="Sender "' \ [to]=test_suite@notmuchmail.org \ [subject]=notmuch-reply-test \ @@ -447,17 +520,18 @@ add_message '[from]="Sender "' \ '[body]="support for reply-to"' \ '[reply-to]="Sender "' -execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +output=$($NOTMUCH reply id:${gen_msg_id}) +pass_if_equal "$output" "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}> +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" +printf " Un-munging Reply-To...\t\t\t\t" add_message '[from]="Sender "' \ '[to]="Some List "' \ [subject]=notmuch-reply-test \ @@ -465,12 +539,13 @@ add_message '[from]="Sender "' \ '[body]="Un-munging Reply-To"' \ '[reply-to]="Evil Munging List "' -execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite +output=$($NOTMUCH reply id:${gen_msg_id}) +pass_if_equal "$output" "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}> +References: <${gen_msg_id}> On Tue, 05 Jan 2010 15:43:56 -0800, Sender wrote: > Un-munging Reply-To" @@ -494,45 +569,59 @@ end Finally, we have our afteruudata marker as well."' -printf " Ensure content before uu data is indexed..." -execute_expecting "search beforeuudata" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; uuencodetest (inbox unread)" -printf " Ensure uu data is not indexed...\t" -execute_expecting "search DURINGUUDATA" "" -printf " Ensure content after uu data is indexed..." -execute_expecting "search afteruudata" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; uuencodetest (inbox unread)" +printf " Ensure content before uu data is indexed...\t" +output=$($NOTMUCH search beforeuudata | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; uuencodetest (inbox unread)" +printf " Ensure uu data is not indexed...\t\t" +output=$($NOTMUCH search DURINGUUDATA | notmuch_search_sanitize) +pass_if_equal "$output" "" +printf " Ensure content after uu data is indexed...\t" +output=$($NOTMUCH search afteruudata | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [1/1] Notmuch Test Suite; uuencodetest (inbox unread)" printf "\nTesting \"notmuch dump\" and \"notmuch restore\":\n" -printf " Dumping all tags...\t\t" +printf " Dumping all tags...\t\t\t\t" $NOTMUCH dump dump.expected -echo " PASS" +pass_if_equal "$?" "0" -printf " Clearing all tags...\t\t" +printf " Clearing all tags...\t\t\t\t" sed -e 's/(\([^(]*\))$/()/' < dump.expected > clear.expected $NOTMUCH restore clear.expected $NOTMUCH dump clear.actual -if diff clear.expected clear.actual > /dev/null; then - echo " PASS" -else - echo " FAIL" - echo " Expected output: See file clear.expected" - echo " Actual output: See file clear.actual" -fi - -printf " Restoring original tags...\t" +pass_if_equal "$(< clear.actual)" "$(< clear.expected)" + +printf " Restoring original tags...\t\t\t" $NOTMUCH restore dump.expected $NOTMUCH dump dump.actual -if diff dump.expected dump.actual > /dev/null; then - echo " PASS" -else - echo " FAIL" - echo " Expected output: See file dump.expected" - echo " Actual output: See file dump.actual" -fi - -printf " Restore with nothing to do...\t" +pass_if_equal "$(< dump.actual)" "$(< dump.expected)" + +printf " Restore with nothing to do...\t\t\t" $NOTMUCH restore dump.expected -echo " PASS" +pass_if_equal "$?" "0" + +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"' +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." +printf " Searching returns the message...\t\t" +output=$($NOTMUCH search foo | notmuch_search_sanitize) +pass_if_equal "$output" "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"' +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." +printf " Searching returns both messages in one thread..." +output=$($NOTMUCH search foo | notmuch_search_sanitize) +pass_if_equal "$output" "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"' +output=$(NOTMUCH_NEW) +pass_if_equal "$output" "Added 1 new message to the database." +printf " Searching returns all three messages in one thread..." +output=$($NOTMUCH search foo | notmuch_search_sanitize) +pass_if_equal "$output" "thread:XXX 2000-01-01 [3/3] Notmuch Test Suite; brokenthreadtest (inbox unread)" cat <