one more intermittent test failure

diff --git a/d2/cab5d15eaf7a7bc710b7ce1b6ef32805548613 b/d2/cab5d15eaf7a7bc710b7ce1b6ef32805548613
new file mode 100644 (file)
index 0000000..5c69bbb
--- /dev/null
+++ b/d2/cab5d15eaf7a7bc710b7ce1b6ef32805548613
@@ -0,0 +1,75 @@
+Return-Path: <david@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 olra.theworths.org (Postfix) with ESMTP id 89B24431FD0\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Dec 2013 17:06:29 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 28Ner-tlII5K for <notmuch@notmuchmail.org>;\r
+       Sun, 22 Dec 2013 17:06:23 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 61E4B431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 22 Dec 2013 17:06:23 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1VutyN-0006QV-18; Sun, 22 Dec 2013 21:06:19 -0400\r
+Received: (nullmailer pid 5907 invoked by uid 1000); Mon, 23 Dec 2013\r
+       01:06:10 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch mailing list <notmuch@notmuchmail.org>\r
+Subject: one more intermittent test failure\r
+User-Agent: Notmuch/0.17~rc3 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 23 Dec 2013 09:06:10 +0800\r
+Message-ID: <87bo089y0t.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Mon, 23 Dec 2013 01:06:29 -0000\r
+\r
+\r
+Hi All;\r
+\r
+Since we've had some luck cleaning up intermittent test failures, I\r
+thought it would be nice if we could fix this one. We've seen it on the\r
+buildbot from time to time, and it's pretty easy to duplicate with \r
+\r
+make test-binaries && count=0 && while ./new; do \r
+count=$(( count + 1))\r
+echo $count\r
+done\r
+\r
+\r
+ FAIL   Ignore files and directories specified in new.ignore (multiple occurrences)\r
+       --- new.22.expected     2013-12-23 00:41:18.015910311 +0000\r
+       +++ new.22.output       2013-12-23 00:41:18.015910311 +0000\r
+       @@ -5,9 +5,6 @@\r
+        (D) add_files_recursive, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/one/two/ignored_file\r
+        (D) add_files_recursive, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/one/two/three/.git\r
+        (D) add_files_recursive, pass 1: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/one/two/three/ignored_file\r
+       -(D) add_files_recursive, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/.git\r
+       -(D) add_files_recursive, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/.ignored_hidden_file\r
+       -(D) add_files_recursive, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/ignored_file\r
+        (D) add_files_recursive, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/one/ignored_file\r
+        (D) add_files_recursive, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/one/two/ignored_file\r
+        (D) add_files_recursive, pass 2: explicitly ignoring /home/bremner/software/upstream/notmuch/test/tmp.new/mail/one/two/three/.git\r