diff options
| author |  Jani Nikula <jani@nikula.org> | 2014-06-05 08:34:09 +0200 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2014-06-13 22:59:04 -0300 |
| commit | 0cc0144875875fe974fe0851b5c2c21d63d9b06d (patch) | |
| tree | ec8db15381d68bc24febdaa602053a34bd92110e /test | |
| parent | 2d722bf032bbd4b08b415369e07a3c9e26f2472a (diff) | |
lib: resurrect support for single-message mbox files
This is effectively a revert of
commit 6812136bf576d894591606d9e10096719054d1f9
Author: Jani Nikula <jani@nikula.org>
Date: Mon Mar 31 00:21:48 2014 +0300
lib: drop support for single-message mbox files
The intention was to drop support for indexing new single-message mbox
files (and whether that was a good idea in the first place is
arguable). However this inadvertently broke support for reading
headers from previously indexed single-message mbox files, which is
far worse.
Distinguishing between the two cases would require more code than
simply bringing back support for single-message mbox files.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T050-new.sh | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/test/T050-new.sh b/test/T050-new.sh index 3c319542..ad46ee6d 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -163,6 +163,22 @@ 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 @@ -184,24 +200,14 @@ 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 |