diff options
| author |  Jani Nikula <jani@nikula.org> | 2014-03-31 00:21:48 +0300 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2014-04-05 12:52:42 -0300 |
| commit | 6812136bf576d894591606d9e10096719054d1f9 (patch) | |
| tree | 6770eaeb8f12d19824febf8cb9c6b4c0c87e41f8 /test | |
| parent | 3863755f6d9f3e7666c1484822384c036a4426c3 (diff) | |
lib: drop support for single-message mbox files
We've supported mbox files containing a single message for historical
reasons, but the support has been deprecated, with a warning message
while indexing, since Notmuch 0.15. Finally drop the support, and
consider all mbox files non-email.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T050-new.sh | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/test/T050-new.sh b/test/T050-new.sh index ad46ee6d..3c319542 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -163,22 +163,6 @@ rm -rf "${MAIL_DIR}"/two output=$(NOTMUCH_NEW) test_expect_equal "$output" "No new mail. Removed 3 messages." -test_begin_subtest "Support single-message mbox (deprecated)" -cat > "${MAIL_DIR}"/mbox_file1 <<EOF -From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001 -From: Notmuch Test Suite <test_suite@notmuchmail.org> -To: Notmuch Test Suite <test_suite@notmuchmail.org> -Subject: Test mbox message 1 - -Body. -EOF -output=$(NOTMUCH_NEW 2>&1) -test_expect_equal "$output" \ -"Warning: ${MAIL_DIR}/mbox_file1 is an mbox containing a single message, -likely caused by misconfigured mail delivery. Support for single-message -mboxes is deprecated and may be removed in the future. -Added 1 new message to the database." - # This test requires that notmuch new has been run at least once. test_begin_subtest "Skip and report non-mail files" generate_message @@ -200,14 +184,24 @@ Subject: Test mbox message 2 Body 2. EOF +cat > "${MAIL_DIR}"/mbox_file1 <<EOF +From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001 +From: Notmuch Test Suite <test_suite@notmuchmail.org> +To: Notmuch Test Suite <test_suite@notmuchmail.org> +Subject: Test mbox message 1 + +Body. +EOF output=$(NOTMUCH_NEW 2>&1) test_expect_equal "$output" \ "Note: Ignoring non-mail file: ${MAIL_DIR}/.git/config Note: Ignoring non-mail file: ${MAIL_DIR}/.ignored_hidden_file Note: Ignoring non-mail file: ${MAIL_DIR}/ignored_file Note: Ignoring non-mail file: ${MAIL_DIR}/mbox_file +Note: Ignoring non-mail file: ${MAIL_DIR}/mbox_file1 Added 1 new message to the database." rm "${MAIL_DIR}"/mbox_file +rm "${MAIL_DIR}"/mbox_file1 test_begin_subtest "Ignore files and directories specified in new.ignore" generate_message |