[PATCH 2/3] test: Test for ignoring multi-message mbox

diff --git a/df/bce1bd613c02fe17133c9b6a09a8457cc49d72 b/df/bce1bd613c02fe17133c9b6a09a8457cc49d72
new file mode 100644 (file)
index 0000000..839d8da
--- /dev/null
+++ b/df/bce1bd613c02fe17133c9b6a09a8457cc49d72
@@ -0,0 +1,121 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 36240431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 22:16:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id QqVh2j3ObHAV for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 22:16:11 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 896EF431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 22:16:11 -0800 (PST)\r
+X-AuditID: 12074425-b7fcc6d00000091f-5e-50b1b7ab3bec\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id E8.BB.02335.BA7B1B05; Sun, 25 Nov 2012 01:16:11 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qAP6G5Ac028265; \r
+       Sun, 25 Nov 2012 01:16:05 -0500\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAP6G3i9006918\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 25 Nov 2012 01:16:04 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TcVVb-0008HO-96; Sun, 25 Nov 2012 01:16:03 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] test: Test for ignoring multi-message mbox\r
+Date: Sun, 25 Nov 2012 01:16:00 -0500\r
+Message-Id: <1353824161-31717-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353824161-31717-1-git-send-email-amdragon@mit.edu>\r
+References: <1353824161-31717-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nort6+8YAg6ez2SxutHYzWly/OZPZ\r
+       gcnj2apbzB5bDr1nDmCK4rJJSc3JLEst0rdL4Mr4cXYKY8EPnorjn64wNzB+4upi5OSQEDCR\r
+       eHrmOCuELSZx4d56ti5GLg4hgX2MEtdfvmOFcDYwSpzYeJ8FwnnEJLH/2g4mkBYhgbmMEj1z\r
+       2UFsNgENiW37lzOC2CIC0hI7784GG8ssYClx9Ws7WL2wgL3E0lmP2EBsFgFViXfHesHivAIO\r
+       Es8bFzJCnKEo0f1sAlgNp4CjxMK+A2wQuxwkzk8+zjKBkX8BI8MqRtmU3Crd3MTMnOLUZN3i\r
+       5MS8vNQiXQu93MwSvdSU0k2M4FByUd3BOOGQ0iFGAQ5GJR7eG4kbA4RYE8uKK3MPMUpyMCmJ\r
+       8k7dDBTiS8pPqcxILM6ILyrNSS0+xCjBwawkwntgLVCONyWxsiq1KB8mJc3BoiTOeyPlpr+Q\r
+       QHpiSWp2ampBahFMVoaDQ0mCd/tWoEbBotT01Iq0zJwShDQTByfIcB6g4dLbQYYXFyTmFmem\r
+       Q+RPMSpKifP+2QaUEABJZJTmwfXCYv0VozjQK8K8giDtPMA0Adf9CmgwE9Dgp7PXgQwuSURI\r
+       STUwei1Q3vrvn4ux4OcHzyV8pNSzObJMmlede797C3ve1q62i/6ny0snTNPilT00exr3MyGp\r
+       FY9E8t4YdM+S/m23PcNy5rH9xVw5Bx56NE1RWrA6NGiquJry7utiNgqljy37P/S52H3TrNde\r
+       +ar8xJ4j00XVu9wOLtu1+NCB+TvZbxnvk8opCpmcrMRSnJFoqMVcVJwIAOVctlzQAgAA\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Sun, 25 Nov 2012 06:16:12 -0000\r
+\r
+This test is currently broken.  Note that its brokenness cascades and\r
+causes the next test to fail as well (because notmuch incorrectly\r
+indexes the mbox file).\r
+---\r
+ test/new |   18 ++++++++++++++++++\r
+ 1 file changed, 18 insertions(+)\r
+\r
+diff --git a/test/new b/test/new\r
+index 43d56e4..29f9aff 100755\r
+--- a/test/new\r
++++ b/test/new\r
+@@ -178,16 +178,34 @@ test_expect_equal "$output" \\r
+ \r
+ # This test requires that notmuch new has been run at least once.\r
+ test_begin_subtest "Skip and report non-mail files"\r
++test_subtest_known_broken\r
+ generate_message\r
+ mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config\r
+ touch "${MAIL_DIR}"/ignored_file\r
+ touch "${MAIL_DIR}"/.ignored_hidden_file\r
++cat > "${MAIL_DIR}"/mbox_file <<EOF\r
++From test_suite@notmuchmail.org Fri Jan  5 15:43:57 2001\r
++From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++Subject: Test mbox message 1\r
++\r
++Body.\r
++\r
++From test_suite@notmuchmail.org Fri Jan  5 15:43:57 2001\r
++From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
++Subject: Test mbox message 2\r
++\r
++Body 2.\r
++EOF\r
+ output=$(NOTMUCH_NEW 2>&1)\r
+ test_expect_equal "$output" \\r
+ "Note: Ignoring non-mail file: ${MAIL_DIR}/.git/config\r
+ Note: Ignoring non-mail file: ${MAIL_DIR}/.ignored_hidden_file\r
+ Note: Ignoring non-mail file: ${MAIL_DIR}/ignored_file\r
++Note: Ignoring non-mail file: ${MAIL_DIR}/mbox_file\r
+ Added 1 new message to the database."\r
++rm "${MAIL_DIR}"/mbox_file\r
+ \r
+ test_begin_subtest "Ignore files and directories specified in new.ignore"\r
+ generate_message\r
+-- \r
+1.7.10.4\r
+\r