[PATCH 1/3] test: flag one more notmuch new test as broken

diff --git a/d8/f8ee61b759a0c9a6447ced6d126ae2027f8953 b/d8/f8ee61b759a0c9a6447ced6d126ae2027f8953
new file mode 100644 (file)
index 0000000..de2eaf9
--- /dev/null
+++ b/d8/f8ee61b759a0c9a6447ced6d126ae2027f8953
@@ -0,0 +1,83 @@
+Return-Path: <bremner@tethera.net>\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 13E486DE1410\r
+ for <notmuch@notmuchmail.org>; Sat, 10 Oct 2015 05:29:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.105\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.105 tagged_above=-999 required=5 tests=[AWL=0.105]\r
+ 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 C9APMLqw3Ocg for <notmuch@notmuchmail.org>;\r
+ Sat, 10 Oct 2015 05:29:46 -0700 (PDT)\r
+Received: from gitolite.debian.net (gitolite.debian.net [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 536756DE0C11\r
+ for <notmuch@notmuchmail.org>; Sat, 10 Oct 2015 05:29:46 -0700 (PDT)\r
+Received: from remotemail by gitolite.debian.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1ZktFw-0008An-4M; Sat, 10 Oct 2015 12:28:08 +0000\r
+Received: (nullmailer pid 8594 invoked by uid 1000); Sat, 10 Oct 2015\r
+ 12:27:30 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] test: flag one more notmuch new test as broken\r
+Date: Sat, 10 Oct 2015 09:27:17 -0300\r
+Message-Id: <1444480039-8530-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.5.3\r
+In-Reply-To: <1444480039-8530-1-git-send-email-david@tethera.net>\r
+References:\r
+ <591f5298ac3f2c79f727cac8bad1251830b28a3c.1443213654.git.jani@nikula.org>\r
+ <1444480039-8530-1-git-send-email-david@tethera.net>\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: Sat, 10 Oct 2015 12:29:48 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+Drop the test update added in [1] and mark the test as broken, like the\r
+tests flagged as broken in [2]. These all reflect the same underlying\r
+breakage with (lack of) directory deletion.\r
+\r
+[1] commit e4e04bbc328f990e36b77f508aef904d156029b1\r
+[2] commit ed9ceda623d3f22fb66365b33db63c5c982067d3\r
+---\r
+ test/T050-new.sh | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/test/T050-new.sh b/test/T050-new.sh\r
+index 6257392..33ce1ab 100755\r
+--- a/test/T050-new.sh\r
++++ b/test/T050-new.sh\r
+@@ -224,6 +224,7 @@ output=$(NOTMUCH_NEW 2>&1)\r
+ test_expect_equal "$output" "Added 1 new message to the database."\r
+ \r
+ test_begin_subtest "Ignore files and directories specified in new.ignore (multiple occurrences)"\r
++test_subtest_known_broken\r
+ notmuch config set new.ignore .git ignored_file .ignored_hidden_file\r
+ notmuch new > /dev/null # ensure that files/folders will be printed in ASCII order.\r
+ touch "${MAIL_DIR}"/.git # change .git's mtime for notmuch new to rescan.\r
+@@ -246,7 +247,6 @@ test_expect_equal "$output" \\r
+ (D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file\r
+ (D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/.git\r
+ (D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file\r
+-(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database\r
+ No new mail."\r
+ \r
+ \r
+-- \r
+2.5.3\r
+\r