[PATCH 2/3] test: initial tests for locking retry

diff --git a/10/2ba57e2470f2eccc04ac38d04f78c2640b62bb b/10/2ba57e2470f2eccc04ac38d04f78c2640b62bb
new file mode 100644 (file)
index 0000000..684f65b
--- /dev/null
+++ b/10/2ba57e2470f2eccc04ac38d04f78c2640b62bb
@@ -0,0 +1,138 @@
+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 EEFEB6DE091B\r
+ for <notmuch@notmuchmail.org>; Sun, 26 Jun 2016 08:30:13 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.005\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.005 tagged_above=-999 required=5\r
+ tests=[AWL=-0.006, HEADER_FROM_DIFFERENT_DOMAINS=0.001]\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 x2C_iX1EMw96 for <notmuch@notmuchmail.org>;\r
+ Sun, 26 Jun 2016 08:30:06 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 496476DE0350\r
+ for <notmuch@notmuchmail.org>; Sun, 26 Jun 2016 08:30:02 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1bHC0G-000234-8e; Sun, 26 Jun 2016 11:29:44 -0400\r
+Received: (nullmailer pid 26561 invoked by uid 1000);\r
+ Sun, 26 Jun 2016 15:29:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] test: initial tests for locking retry\r
+Date: Sun, 26 Jun 2016 17:29:44 +0200\r
+Message-Id: <1466954985-25761-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <1466954985-25761-1-git-send-email-david@tethera.net>\r
+References: <1466954985-25761-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 26 Jun 2016 15:30:14 -0000\r
+\r
+Currently there's not much to test, so we simulate contention, and check\r
+that the modifications to the database are serialized.\r
+---\r
+ test/T620-lock.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 75 insertions(+)\r
+ create mode 100755 test/T620-lock.sh\r
+\r
+diff --git a/test/T620-lock.sh b/test/T620-lock.sh\r
+new file mode 100755\r
+index 0000000..f46475e\r
+--- /dev/null\r
++++ b/test/T620-lock.sh\r
+@@ -0,0 +1,75 @@\r
++#!/usr/bin/env bash\r
++test_description="locking"\r
++. ./test-lib.sh || exit 1\r
++\r
++if [ "${NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK}" = "0" ]; then\r
++    test_subtest_missing_external_prereq_["lock retry support"]=t\r
++fi\r
++\r
++add_email_corpus\r
++\r
++test_begin_subtest "blocking open"\r
++test_C ${MAIL_DIR} <<'EOF'\r
++#include <unistd.h>\r
++#include <stdlib.h>\r
++#include <sys/wait.h>\r
++#include <notmuch-test.h>\r
++\r
++void\r
++taggit (notmuch_database_t *db, const char *tag)\r
++{\r
++    notmuch_message_t *message;\r
++\r
++    EXPECT0 (notmuch_database_find_message (db, "4EFC743A.3060609@april.org", &message));\r
++    if (message == NULL) {\r
++      fprintf (stderr, "unable to find message");\r
++      exit (1);\r
++    }\r
++\r
++    EXPECT0 (notmuch_message_add_tag (message, tag));\r
++    notmuch_message_destroy (message);\r
++}\r
++\r
++int\r
++main (int argc, char **argv)\r
++{\r
++    pid_t child;\r
++    const char *path = argv[1];\r
++\r
++    child = fork ();\r
++    if (child == -1) {\r
++      fprintf (stderr, "fork failed\n");\r
++      exit (1);\r
++    }\r
++\r
++    if (child == 0) {\r
++      notmuch_database_t *db2;\r
++\r
++      sleep (1);\r
++      EXPECT0 (notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_WRITE, &db2));\r
++      taggit (db2, "child");\r
++      EXPECT0 (notmuch_database_close (db2));\r
++    } else {\r
++      notmuch_database_t *db;\r
++\r
++      EXPECT0 (notmuch_database_open (path, NOTMUCH_DATABASE_MODE_READ_WRITE, &db));\r
++      taggit (db, "parent");\r
++      sleep (2);\r
++      EXPECT0 (notmuch_database_close (db));\r
++      wait (NULL);\r
++    }\r
++}\r
++\r
++EOF\r
++notmuch search --output=tags id:4EFC743A.3060609@april.org >> OUTPUT\r
++cat <<'EOF' >EXPECTED\r
++== stdout ==\r
++== stderr ==\r
++child\r
++inbox\r
++parent\r
++unread\r
++EOF\r
++test_expect_equal_file EXPECTED OUTPUT\r
++\r
++test_done\r
+-- \r
+2.8.1\r
+\r