[PATCH 1/3] test: don't claim single message mbox support is going away

diff --git a/99/1336619d9dd498387286e109340edb5076c53c b/99/1336619d9dd498387286e109340edb5076c53c
new file mode 100644 (file)
index 0000000..3a0ac97
--- /dev/null
+++ b/99/1336619d9dd498387286e109340edb5076c53c
@@ -0,0 +1,93 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id EE9336DE13CC\r
+ for <notmuch@notmuchmail.org>; Mon,  3 Aug 2015 23:50:29 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.148\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.148 tagged_above=-999 required=5 tests=[AWL=0.138, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id MNAbZZdv66AG for <notmuch@notmuchmail.org>;\r
+ Mon,  3 Aug 2015 23:50:28 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 1B6556DE10C1\r
+ for <notmuch@notmuchmail.org>; Mon,  3 Aug 2015 23:50:28 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1ZMW2I-0000QM-Ui; Tue, 04 Aug 2015 06:49:18 +0000\r
+Received: (nullmailer pid 17846 invoked by uid 1000); Tue, 04 Aug 2015\r
+ 06:48:53 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, David Bremner <david@tethera.net>\r
+Subject: [PATCH 1/3] test: don't claim single message mbox support is going\r
+ away\r
+Date: Tue,  4 Aug 2015 08:48:32 +0200\r
+Message-Id: <1438670914-17203-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1438670914-17203-1-git-send-email-david@tethera.net>\r
+References: <m2a8ua2gm9.fsf@guru.guru-group.fi>\r
+ <1438670914-17203-1-git-send-email-david@tethera.net>\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 04 Aug 2015 06:50:30 -0000\r
+\r
+We gave up on this.\r
+---\r
+ test/T050-new.sh | 13 ++++++++-----\r
+ 1 file changed, 8 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/T050-new.sh b/test/T050-new.sh\r
+index e6c3291..66ea10f 100755\r
+--- a/test/T050-new.sh\r
++++ b/test/T050-new.sh\r
+@@ -63,15 +63,18 @@ test_begin_subtest "Renamed message"\r
+ generate_message\r
+ notmuch new > /dev/null\r
+ mv "$gen_msg_filename" "${gen_msg_filename}"-renamed\r
+-output=$(NOTMUCH_NEW)\r
+-test_expect_equal "$output" "No new mail. Detected 1 file rename."\r
++output=$(NOTMUCH_NEW --debug)\r
++test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed file ${gen_msg_filename} for deletion from database\r
++No new mail. Detected 1 file rename."\r
+ \r
+ \r
+ test_begin_subtest "Deleted message"\r
+ \r
+ rm "${gen_msg_filename}"-renamed\r
+-output=$(NOTMUCH_NEW)\r
+-test_expect_equal "$output" "No new mail. Removed 1 message."\r
++output=$(NOTMUCH_NEW --debug)\r
++test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover file ${gen_msg_filename}-renamed for deletion from database\r
++No new mail. Removed 1 message."\r
++\r
+ \r
+ \r
+ test_begin_subtest "Renamed directory"\r
+@@ -163,7 +166,7 @@ rm -rf "${MAIL_DIR}"/two\r
+ output=$(NOTMUCH_NEW)\r
+ test_expect_equal "$output" "No new mail. Removed 3 messages."\r
+ \r
+-test_begin_subtest "Support single-message mbox (deprecated)"\r
++test_begin_subtest "Support single-message mbox"\r
+ cat > "${MAIL_DIR}"/mbox_file1 <<EOF\r
+ From test_suite@notmuchmail.org Fri Jan  5 15:43:57 2001\r
+ From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-- \r
+2.1.4\r
+\r