diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2012-11-25 01:16:01 -0500 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2012-11-26 21:12:10 -0400 |
| commit | 610f0e09929a5f351f7c1c3850ac7e0d83ffe388 (patch) | |
| tree | 18dfd7072c95710d5f644808f06c486f71bc360e /test | |
| parent | 079f5a138b685bb33bee86c0ed5b8d17f58b09af (diff) | |
lib: Reject multi-message mboxes and deprecate single-message mbox
Previously, we would treat multi-message mboxes as one giant email,
which, besides the obvious incorrect indexing, often led to
out-of-memory errors for archival mboxes. Now we explicitly reject
multi-message mboxes. For historical reasons, we retain support for
single-message mboxes, but official deprecate this behavior.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/new | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -163,7 +163,7 @@ 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" +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> @@ -174,11 +174,13 @@ Body. EOF output=$(NOTMUCH_NEW 2>&1) test_expect_equal "$output" \ -"Added 1 new message to the database." +"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" -test_subtest_known_broken generate_message mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config touch "${MAIL_DIR}"/ignored_file |