summaryrefslogtreecommitdiff
path: root/test/t0010-from-line-heuristics.sh
diff options
context:
space:
mode:
Diffstat (limited to 'test/t0010-from-line-heuristics.sh')
-rwxr-xr-xtest/t0010-from-line-heuristics.sh142
1 files changed, 66 insertions, 76 deletions
diff --git a/test/t0010-from-line-heuristics.sh b/test/t0010-from-line-heuristics.sh
index 89702b5..613917c 100755
--- a/test/t0010-from-line-heuristics.sh
+++ b/test/t0010-from-line-heuristics.sh
@@ -2,15 +2,15 @@
test_description="From line heuristics (with multiple configured addresses)"
. ./test-lib.sh
-test_expect_success "Magic from guessing (nothing to go on)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (nothing to go on)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -20,17 +20,16 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (Envelope-to:)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (Envelope-to:)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
- "[header]=\"Envelope-To: test_suite_other@notmuchmail.org\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[header]="Envelope-To: test_suite_other@notmuchmail.org"' \
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -40,17 +39,16 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (X-Original-To:)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (X-Original-To:)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
- "[header]=\"X-Original-To: test_suite_other@notmuchmail.org\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[header]="X-Original-To: test_suite_other@notmuchmail.org"' \
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -60,19 +58,18 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (Received: .. for ..)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (Received: .. for ..)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
"[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
by mail.notmuchmail.org (some MTA) with ESMTP id 12345678\
for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -82,19 +79,18 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (Received: domain)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (Received: domain)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
"[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
by mail.otherdomain.org (some MTA) with ESMTP id 12345678\
Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@otherdomain.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -105,20 +101,18 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Testing From line heuristics (with single configured address)" '
+test_begin_subtest "Testing From line heuristics (with single configured address)"
sed -i -e "s/^other_email.*//" "${NOTMUCH_CONFIG}"
-'
-test_expect_success "Magic from guessing (nothing to go on)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (nothing to go on)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -128,17 +122,16 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (Envelope-to:)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (Envelope-to:)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
- "[header]=\"Envelope-To: test_suite_other@notmuchmail.org\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[header]="Envelope-To: test_suite_other@notmuchmail.org"' \
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -148,17 +141,16 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (X-Original-To:)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (X-Original-To:)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
- "[header]=\"X-Original-To: test_suite_other@notmuchmail.org\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[header]="X-Original-To: test_suite_other@notmuchmail.org"' \
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -168,19 +160,18 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (Received: .. for ..)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (Received: .. for ..)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
"[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
by mail.notmuchmail.org (some MTA) with ESMTP id 12345678\
for <test_suite_other@notmuchmail.org>; Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -190,19 +181,18 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
-test_expect_success "Magic from guessing (Received: domain)" '
-add_message "[from]=\"Sender <sender@example.com>\"" \
+test_begin_subtest "Magic from guessing (Received: domain)"
+add_message '[from]="Sender <sender@example.com>"' \
[to]=mailinglist@notmuchmail.org \
[subject]=notmuch-reply-test \
"[header]=\"Received: from mail.example.com (mail.example.com [1.1.1.1])\
by mail.otherdomain.org (some MTA) with ESMTP id 12345678\
Sat, 10 Apr 2010 07:54:51 -0400 (EDT)\"" \
- "[date]=\"Tue, 05 Jan 2010 15:43:56 -0000\"" \
- "[body]=\"from guessing test\"" &&
+ '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
+ '[body]="from guessing test"'
-output=$($NOTMUCH reply id:${gen_msg_id}) &&
-pass_if_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
+output=$($NOTMUCH reply id:${gen_msg_id})
+test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
Subject: Re: notmuch-reply-test
To: Sender <sender@example.com>, mailinglist@notmuchmail.org
Bcc: test_suite@notmuchmail.org
@@ -211,5 +201,5 @@ References: <${gen_msg_id}>
On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
> from guessing test"
-'
+
test_done