mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-21 18:38:08 +01:00
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.
This commit is contained in:
parent
2bc0af15aa
commit
5c938e51b2
1 changed files with 46 additions and 41 deletions
|
@ -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 <sender@example.com>"' \
|
||||
[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 <sender@example.com>"' \
|
||||
[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 <test_suite@notmuchmail.org>
|
||||
Subject: Re: notmuch-reply-test
|
||||
To: Sender <sender@example.com>
|
||||
|
@ -321,13 +331,12 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
|
|||
> basic reply test"
|
||||
|
||||
printf " Multiple recipients...\t\t"
|
||||
generate_message '[from]="Sender <sender@example.com>"' \
|
||||
'[to]="test_suite@notmuchmail.org, Someone Else <someone@example.com>"' \
|
||||
[subject]=notmuch-reply-test \
|
||||
'[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \
|
||||
'[body]="Multiple recipients"'
|
||||
add_message '[from]="Sender <sender@example.com>"' \
|
||||
'[to]="test_suite@notmuchmail.org, Someone Else <someone@example.com>"' \
|
||||
[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 <test_suite@notmuchmail.org>
|
||||
Subject: Re: notmuch-reply-test
|
||||
To: Sender <sender@example.com>, Someone Else <someone@example.com>
|
||||
|
@ -339,14 +348,13 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
|
|||
> Multiple recipients"
|
||||
|
||||
printf " Reply with CC...\t\t"
|
||||
generate_message '[from]="Sender <sender@example.com>"' \
|
||||
[to]=test_suite@notmuchmail.org \
|
||||
'[cc]="Other Parties <cc@example.com>"' \
|
||||
[subject]=notmuch-reply-test \
|
||||
'[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \
|
||||
'[body]="reply with CC"'
|
||||
add_message '[from]="Sender <sender@example.com>"' \
|
||||
[to]=test_suite@notmuchmail.org \
|
||||
'[cc]="Other Parties <cc@example.com>"' \
|
||||
[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 <test_suite@notmuchmail.org>
|
||||
Subject: Re: notmuch-reply-test
|
||||
To: Sender <sender@example.com>
|
||||
|
@ -359,13 +367,12 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
|
|||
> reply with CC"
|
||||
|
||||
printf " Reply from alternate address..."
|
||||
generate_message '[from]="Sender <sender@example.com>"' \
|
||||
[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 <sender@example.com>"' \
|
||||
[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 <test_suite_other@notmuchmail.org>
|
||||
Subject: Re: notmuch-reply-test
|
||||
To: Sender <sender@example.com>
|
||||
|
@ -377,14 +384,13 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
|
|||
> reply from alternate address"
|
||||
|
||||
printf " Support for Reply-To...\t"
|
||||
generate_message '[from]="Sender <sender@example.com>"' \
|
||||
[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 <elsewhere@example.com>"'
|
||||
add_message '[from]="Sender <sender@example.com>"' \
|
||||
[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 <elsewhere@example.com>"'
|
||||
|
||||
$NOTMUCH new > /dev/null
|
||||
execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
|
||||
Subject: Re: notmuch-reply-test
|
||||
To: Sender <elsewhere@example.com>
|
||||
|
@ -396,14 +402,13 @@ On Tue, 05 Jan 2010 15:43:56 -0800, Sender <sender@example.com> wrote:
|
|||
> support for reply-to"
|
||||
|
||||
printf " Un-munging Reply-To...\t\t"
|
||||
generate_message '[from]="Sender <sender@example.com>"' \
|
||||
'[to]="Some List <list@example.com>"' \
|
||||
[subject]=notmuch-reply-test \
|
||||
'[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \
|
||||
'[body]="Un-munging Reply-To"' \
|
||||
'[reply-to]="Evil Munging List <list@example.com>"'
|
||||
add_message '[from]="Sender <sender@example.com>"' \
|
||||
'[to]="Some List <list@example.com>"' \
|
||||
[subject]=notmuch-reply-test \
|
||||
'[date]="Tue, 05 Jan 2010 15:43:56 -0800"' \
|
||||
'[body]="Un-munging Reply-To"' \
|
||||
'[reply-to]="Evil Munging List <list@example.com>"'
|
||||
|
||||
$NOTMUCH new > /dev/null
|
||||
execute_expecting "reply id:${gen_msg_id}" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
|
||||
Subject: Re: notmuch-reply-test
|
||||
To: Sender <sender@example.com>, Some List <list@example.com>
|
||||
|
|
Loading…
Reference in a new issue