diff options
| author |  David Bremner <david@tethera.net> | 2014-06-13 23:03:49 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-06-13 23:03:49 -0300 |
| commit | 44e6c52c76199f707b344b3303710a03201bee40 (patch) | |
| tree | 8b32ac27a2baef2c8032c79e4d16e47a95b5f379 /test | |
| parent | fe8cd90f97a078336612cd441a783096d6350564 (diff) | |
| parent | 0cc0144875875fe974fe0851b5c2c21d63d9b06d (diff) | |
Merge branch 'release'
Merge in a few more commits towards 0.18.1
Diffstat (limited to 'test')
| -rwxr-xr-x | test/T050-new.sh | 26 | ||||
| -rw-r--r-- | test/test-lib.sh | 7 |
2 files changed, 19 insertions, 14 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 diff --git a/test/test-lib.sh b/test/test-lib.sh index 8697d6a7..17deaaba 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1081,15 +1081,14 @@ export NOTMUCH_CONFIG=$NOTMUCH_CONFIG # Here's what we are using here: # -# --no-init-file Don't load users ~/.emacs -# -# --no-site-file Don't load the site-wide startup stuff +# --quick Use minimal customization. This implies --no-init-file, +# --no-site-file and (emacs 24) --no-site-lisp # # --directory Ensure that the local elisp sources are found # # --load Force loading of notmuch.el and test-lib.el -exec ${TEST_EMACS} --no-init-file --no-site-file \ +exec ${TEST_EMACS} --quick \ --directory "$TEST_DIRECTORY/../emacs" --load notmuch.el \ --directory "$TEST_DIRECTORY" --load test-lib.el \ "\$@" |