X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2Fnotmuch-test;h=ed8d2ad4bd5843c7f77e1d6583988ee340135094;hp=d7b85c0383d4c3a161637f219085a190237f1004;hb=96134fc72352206877719d275b81b4e50a85e943;hpb=a2d919eb2f55ab503a95f5401c19cc162a7a46a0 diff --git a/test/notmuch-test b/test/notmuch-test index d7b85c03..ed8d2ad4 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -e find_notmuch_binary () @@ -20,39 +20,135 @@ find_notmuch_binary () echo notmuch } +increment_mtime_amount=0 +increment_mtime () +{ + dir=$1 + + increment_mtime_amount=$((increment_mtime_amount + 1)) + touch -d "+${increment_mtime_amount} seconds" $dir +} + # Generate a new message in the mail directory, with # a unique message ID and subject. # -# The filename of the message generated is available as -# $gen_msg_filename +# After this function returns, the filename of the generated message +# is available as $gen_msg_filename and the message ID is available as +# $gen_msg_id . +# +# This function supports named parameters with the bash syntax for +# assigning a value to an associative array ([name]=value). The +# supported parameters are: +# +# [dir]=directory/of/choice +# +# Generate the message in directory 'directory/of/choice' within +# the mail store. The directory will be created if necessary. +# +# [body]=text +# +# Text to use as the body of the email message +# +# '[from]="Some User "' +# '[to]="Some User "' +# '[subject]="Subject of email message"' +# '[date]="RFC 822 Date"' +# +# Values for email headers. If not provided, default values will +# be generated instead. +# +# '[cc]="Some User "' +# [reply-to]=some-address +# [in-reply-to]= +# +# Additional values for email headers. If these are not provided +# then the relevant headers will simply not appear in the +# message. gen_msg_cnt=0 gen_msg_filename="" +gen_msg_id="" generate_message () { + # This is our (bash-specific) magic for doing named parameters + 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 [ "$#" = "0" ]; then + if [ -z "${template[dir]}" ]; then gen_msg_filename="${MAIL_DIR}/$gen_msg_name" else - gen_msg_filename="${MAIL_DIR}/$1/$gen_msg_name" + gen_msg_filename="${MAIL_DIR}/${template[dir]}/$gen_msg_name" mkdir -p $(dirname $gen_msg_filename) fi -cat <$gen_msg_filename -From: Notmuch Test Suite -To: Notmuch Test Suite -Message-Id: -Subject: Test message ${gen_msg_filename} -Date: Tue, 05 Jan 2010 15:43:57 -0800 + if [ -z "${template[body]}" ]; then + template[body]="This is just a test message at ${gen_msg_filename}" + fi + + if [ -z "${template[from]}" ]; then + template[from]="Notmuch Test Suite " + fi + + if [ -z "${template[to]}" ]; then + template[to]="Notmuch Test Suite " + fi + + if [ -z "${template[subject]}" ]; then + template[subject]="Test message ${gen_msg_filename}" + fi + + if [ -z "${template[date]}" ]; then + template[date]="Tue, 05 Jan 2010 15:43:57 -0800" + fi -This is just a test message at ${gen_msg_filename} + additional_headers="" + if [ ! -z "${template[reply-to]}" ]; then + additional_headers="Reply-To: ${template[reply-to]} +${additional_headers}" + fi + + if [ ! -z "${template[in-reply-to]}" ]; then + additional_headers="In-Reply-To: ${template[in-reply-to]} +${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]} +Message-Id: <${gen_msg_id}> +Subject: ${template[subject]} +Date: ${template[date]} +${additional_headers} +${template[body]} EOF + + # Ensure that the mtime of the containing directory is updated + increment_mtime $(dirname ${gen_msg_filename}) } -do_sleep () +NOTMUCH_IGNORED_OUTPUT_REGEXP='^Processed [0-9]*( total)? file|Found [0-9]* total file' + +execute_expecting () { - sleep 1 + args=$1 + expected=$2 + + output=$($NOTMUCH $args | grep -v -E -e "$NOTMUCH_IGNORED_OUTPUT_REGEXP") + if [ "$output" = "$expected" ]; then + echo " PASS" + else + echo " FAIL" + echo " Expected output: $expected" + echo " Actual output: $output" + fi } TEST_DIR=$(pwd)/test.$$ @@ -73,110 +169,104 @@ path=${MAIL_DIR} [user] name=Notmuch Test Suite primary_email=test_suite@notmuchmail.org +other_email=test_suite_other@notmuchmail.org EOF -echo "### Testing \"notmuch new\" with no messages" -$NOTMUCH new +printf "Testing \"notmuch new\" in several variations:\n" +printf " No new messages...\t\t" +execute_expecting new "No new mail." -echo "### Testing \"notmuch new\" with 1 new message" -do_sleep +printf " Single new message...\t\t" generate_message -$NOTMUCH new +execute_expecting new "Added 1 new message to the database." -echo "### Testing \"notmuch new\" with 2 new messages" -do_sleep +printf " Multiple new messages...\t" generate_message generate_message -$NOTMUCH new +execute_expecting new "Added 2 new messages to the database." -echo "### Testing \"notmuch new\" with no new messages (and a non-empty database)" +printf " No new messages (non-empty DB)... " +execute_expecting new "No new mail." -$NOTMUCH new - -echo "### Testing \"notmuch new\" with two new directories (one mail)" +printf " New directories...\t\t" rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch mkdir ${MAIL_DIR}/def mkdir ${MAIL_DIR}/ghi -generate_message def +generate_message [dir]=def -$NOTMUCH new +execute_expecting new "Added 1 new message to the database." -echo "### Testing \"notmuch new\" with two new directories (one mail)---opposite inode order" +printf " Alternate inode order...\t" rm -rf ${MAIL_DIR}/.notmuch mv ${MAIL_DIR}/ghi ${MAIL_DIR}/abc rm ${MAIL_DIR}/def/* -generate_message abc +generate_message [dir]=abc -$NOTMUCH new +execute_expecting new "Added 1 new message to the database." -echo "### Testing \"notmuch new\" with 1 old message moved into the mail store" +printf " Message moved in...\t\t" rm -rf ${MAIL_DIR}/* ${MAIL_DIR}/.notmuch generate_message tmp_msg_filename=tmp/$gen_msg_filename mkdir -p $(dirname $tmp_msg_filename) mv $gen_msg_filename $tmp_msg_filename -do_sleep +increment_mtime ${MAIL_DIR} $NOTMUCH new > /dev/null -do_sleep mv $tmp_msg_filename $gen_msg_filename -$NOTMUCH new +increment_mtime ${MAIL_DIR} +execute_expecting new "Added 1 new message to the database." -echo "### Testing \"notmuch new\" with 1 renamed message" +printf " Renamed message...\t\t" -do_sleep generate_message $NOTMUCH new > /dev/null -do_sleep mv $gen_msg_filename ${gen_msg_filename}-renamed -$NOTMUCH new +increment_mtime ${MAIL_DIR} +execute_expecting new "No new mail. Detected 1 file rename." -echo "### Testing \"notmuch new\" with 1 deleted message" +printf " Deleted message...\t\t" -do_sleep rm ${gen_msg_filename}-renamed -$NOTMUCH new - -echo "### Testing \"notmuch new\" with a new directory with 3 messages" +increment_mtime ${MAIL_DIR} +execute_expecting new "No new mail. Removed 1 message." -do_sleep -generate_message dir -generate_message dir -generate_message dir +printf " Renamed directory...\t\t" -$NOTMUCH new +generate_message [dir]=dir +generate_message [dir]=dir +generate_message [dir]=dir -echo "### Testing \"notmuch new\" with a renamed directory of 3 messages" +$NOTMUCH new > /dev/null -do_sleep mv ${MAIL_DIR}/dir ${MAIL_DIR}/dir-renamed +increment_mtime ${MAIL_DIR} -$NOTMUCH new +execute_expecting new "No new mail. Detected 3 file renames." -echo "### Testing \"notmuch new\" with a deleted directory of 3 messages" +printf " Deleted directory...\t\t" -do_sleep rm -rf ${MAIL_DIR}/dir-renamed +increment_mtime ${MAIL_DIR} -$NOTMUCH new +execute_expecting new "No new mail. Removed 3 messages." -echo "### Testing \"notmuch new\" with a new directory with 3 messages (tail of list)" +printf " New directory (at end of list)... " -do_sleep -generate_message zzz -generate_message zzz -generate_message zzz +generate_message [dir]=zzz +generate_message [dir]=zzz +generate_message [dir]=zzz -$NOTMUCH new +execute_expecting new "Added 3 new messages to the database." -echo "### Testing \"notmuch new\" with a deleted directory of 3 messages (tail of list)" +printf " Deleted directory (end of list)... " -do_sleep rm -rf ${MAIL_DIR}/zzz +increment_mtime ${MAIL_DIR} -$NOTMUCH new +execute_expecting new "No new mail. Removed 3 messages." -echo "### Testing \"notmuch new\" with a symlink to an external directory of 1 message" +printf " New symlink to directory...\t" rm -rf ${MAIL_DIR}/.notmuch mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir @@ -184,33 +274,88 @@ mv ${MAIL_DIR} ${TEST_DIR}/actual_maildir mkdir ${MAIL_DIR} ln -s ${TEST_DIR}/actual_maildir ${MAIL_DIR}/symlink -$NOTMUCH new +execute_expecting new "Added 1 new message to the database." -echo "### Testing \"notmuch new\" with a symlink to an external file" -do_sleep +printf " New symlink to a file...\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." -$NOTMUCH new +printf " New two-level directory...\t" -echo "### Testing \"notmuch new\" with a two-level directory with 3 files" +generate_message [dir]=two/levels +generate_message [dir]=two/levels +generate_message [dir]=two/levels -do_sleep -generate_message two/levels -generate_message two/levels -generate_message two/levels +execute_expecting new "Added 3 new messages to the database." -$NOTMUCH new +printf " Deleted two-level directory... " -echo "### Testing \"notmuch new\" with deletion of two-level directory (3 files)" - -do_sleep rm -rf ${MAIL_DIR}/two +increment_mtime ${MAIL_DIR} + +execute_expecting new "No new mail. Removed 3 messages." + +printf "\nTesting \"notmuch reply\" in several variations:\n" -$NOTMUCH new +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"' + +$NOTMUCH new > /dev/null +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: +> basic reply test" + +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"' + +$NOTMUCH new > /dev/null +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" +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 "' + +$NOTMUCH new > /dev/null +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" cat <