[PATCH] WIP: new insert tests for failing indexing.

diff --git a/ca/9cca9aa6b97eba1d684817285b217fe46c3432 b/ca/9cca9aa6b97eba1d684817285b217fe46c3432
new file mode 100644 (file)
index 0000000..9b6aa5d
--- /dev/null
+++ b/ca/9cca9aa6b97eba1d684817285b217fe46c3432
@@ -0,0 +1,97 @@
+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 olra.theworths.org (Postfix) with ESMTP id 03CFE431FD7\r
+       for <notmuch@notmuchmail.org>; Mon, 29 Sep 2014 12:49:51 -0700 (PDT)\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 BoXQFKEx3oHD for <notmuch@notmuchmail.org>;\r
+       Mon, 29 Sep 2014 12:49:46 -0700 (PDT)\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 A6CA7431FD2\r
+       for <notmuch@notmuchmail.org>; Mon, 29 Sep 2014 12:49:46 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1XYgx6-000326-BZ; Mon, 29 Sep 2014 16:49:44 -0300\r
+Received: (nullmailer pid 17559 invoked by uid 1000); Mon, 29 Sep 2014\r
+       19:49:35 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] WIP: new insert tests for failing indexing.\r
+Date: Mon, 29 Sep 2014 21:49:32 +0200\r
+Message-Id: <1412020172-17193-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <cover.1411914914.git.jani@nikula.org>\r
+References: <cover.1411914914.git.jani@nikula.org>\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, 29 Sep 2014 19:49:51 -0000\r
+\r
+The second one fails because the initial write lock fails.\r
+I guess this is maybe a doc bug.\r
+---\r
+ test/T070-insert.sh | 21 +++++++++++++++++++++\r
+ 1 file changed, 21 insertions(+)\r
+\r
+This is what I came up with when trying to induce indexing\r
+failure. The best I could do was make the initial notmuch open fail.\r
+This means my second test is broken.  When I was writing the commit\r
+message I was thinking the man page was therefore wrong, but actually\r
+it's ok.\r
+\r
+I did wonder if it might be a good idea to move the database open\r
+after the message is written to disk, is we want to maximize the\r
+chance of insert --keep "succeeding".\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index aacc643..e7d0ae1 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -183,4 +183,25 @@ test_expect_code 1 "Invalid tags set exit code" \\r
+ \r
+ notmuch config set new.tags $OLDCONFIG\r
+ \r
++\r
++gen_insert_msg\r
++test_python <<EOF &\r
++import notmuch, time, os\r
++with open("write-locker.pid","w") as pidfile:\r
++    pidfile.write(str(os.getpid()))\r
++db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE)\r
++time.sleep(120)\r
++EOF\r
++\r
++# give time for the background process to get started\r
++sleep 1\r
++\r
++test_expect_code 1 "Non-zero exit code due to write lock" \\r
++    'notmuch insert < "$gen_msg_filename" 2>&1'\r
++\r
++test_expect_code 0 "Zero exit code due to --keep flag" \\r
++    'notmuch insert --keep < "$gen_msg_filename" 2>&1'\r
++\r
++kill $(cat ${TMP_DIRECTORY}/write-locker.pid) >/dev/null 2>&1\r
++\r
+ test_done\r
+-- \r
+2.1.0\r
+\r