[PATCH v2 09/10] test: test insert --must-index

diff --git a/50/b26b48751479f5f5ced590da5d6f9af0a7af83 b/50/b26b48751479f5f5ced590da5d6f9af0a7af83
new file mode 100644 (file)
index 0000000..0119f08
--- /dev/null
+++ b/50/b26b48751479f5f5ced590da5d6f9af0a7af83
@@ -0,0 +1,118 @@
+Return-Path: <novalazy@gmail.com>\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 1D017431FCB\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 06:01:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 SjFvwWG2n6Tt for <notmuch@notmuchmail.org>;\r
+       Wed, 16 Apr 2014 06:01:08 -0700 (PDT)\r
+Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com\r
+       [209.85.220.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 65E1F429E31\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 06:00:23 -0700 (PDT)\r
+Received: by mail-pa0-f50.google.com with SMTP id kq14so10888609pab.37\r
+       for <notmuch@notmuchmail.org>; Wed, 16 Apr 2014 06:00:22 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=FGaSSp021HjW1miPH50nvBPcHxxNW3ZM9Sd0efFSieI=;\r
+       b=fCfThf+DrJbE8Ybasu1Q0BNuoIQ92kX9D94K6qr4o0z/BOAlRknkTX9Y6ZJR0WYPvN\r
+       WBusXaxywLvOEaAg+oOntPHNNsEcFPDQDIUdNkkqIhHR0zlOzmJeStw7+2+Usnrf6HEx\r
+       t7tAzZLkmZLvwkQGVHXFmHianzswchRoi87bZ0FQCmegeWGFjkHHWAJ/LG94ZMSPwfTp\r
+       eJIvthC2UcWVeST7n8tSAQD8qxduRCQJ4V0KKKo1TCkKWYfPwUWBIAvcUhJB6TtY6anS\r
+       B7bTOcCsnyKlZDIku8RLJvg/KqTFawrH70KamTEn7VyGsRkBrtoHujmI3XU6kP+wFs94\r
+       D4eg==\r
+X-Received: by 10.66.160.34 with SMTP id xh2mr8266146pab.109.1397653222700;\r
+       Wed, 16 Apr 2014 06:00:22 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215]) by mx.google.com with ESMTPSA id\r
+       qx11sm110909430pab.35.2014.04.16.06.00.20 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Wed, 16 Apr 2014 06:00:22 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 09/10] test: test insert --must-index\r
+Date: Wed, 16 Apr 2014 22:59:24 +1000\r
+Message-Id: <1397653165-15620-10-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.8.4\r
+In-Reply-To: <1397653165-15620-1-git-send-email-novalazy@gmail.com>\r
+References: <1397653165-15620-1-git-send-email-novalazy@gmail.com>\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: Wed, 16 Apr 2014 13:01:14 -0000\r
+\r
+Test the insert --must-index option.\r
+---\r
+ test/T070-insert.sh | 28 +++++++++++++++++++++++++---\r
+ 1 file changed, 25 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index c576efc..4e289c0 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -21,11 +21,20 @@ gen_insert_msg() {\r
+ test_expect_code 2 "Insert zero-length file" \\r
+     "notmuch insert < /dev/null"\r
+ \r
+-# This test is a proxy for other errors that may occur while trying to\r
+-# add a message to the notmuch database, e.g. database locked.\r
+-test_expect_code 0 "Insert non-message" \\r
++test_expect_code 3 "Insert non-message with --must-index on" \\r
++    "echo bad_message | notmuch insert --must-index"\r
++\r
++test_begin_subtest "Non-message file should not exist"\r
++output=$(find "${MAIL_DIR}/cur" "${MAIL_DIR}/new" "${MAIL_DIR}/tmp" -type f -print | wc -l)\r
++test_expect_equal "$output" "0"\r
++\r
++test_expect_code 0 "Insert non-message with --must-index off" \\r
+     "echo bad_message | notmuch insert"\r
+ \r
++test_begin_subtest "Non-message file should exist"\r
++output=$(find "${MAIL_DIR}/cur" "${MAIL_DIR}/new" "${MAIL_DIR}/tmp" -type f -print | wc -l)\r
++test_expect_equal "$output" "1"\r
++\r
+ test_begin_subtest "Database empty so far"\r
+ test_expect_equal "0" "`notmuch count --output=messages '*'`"\r
+ \r
+@@ -77,6 +86,19 @@ notmuch insert +custom -unread < "$gen_msg_filename"\r
+ output=$(notmuch search --output=messages tag:custom NOT tag:unread)\r
+ test_expect_equal "$output" "id:$gen_msg_id"\r
+ \r
++# overlongtag exceeds NOTMUCH_TAG_MAX\r
++ten=0123456789\r
++hundred=${ten}${ten}${ten}${ten}${ten}${ten}${ten}${ten}${ten}${ten}\r
++overlongtag=x${hundred}${hundred}\r
++gen_insert_msg\r
++test_expect_code 3 "Tagging fails with --must-index on" \\r
++    "notmuch insert --must-index +$overlongtag < $gen_msg_filename"\r
++\r
++test_begin_subtest "Tagging fails with --must-index off"\r
++notmuch insert +$overlongtag < "$gen_msg_filename"\r
++output=$(notmuch search --output=messages id:$gen_msg_id)\r
++test_expect_equal "$output" "id:$gen_msg_id"\r
++\r
+ test_begin_subtest "Insert message with default tags stays in new/"\r
+ gen_insert_msg\r
+ notmuch insert < "$gen_msg_filename"\r
+-- \r
+1.8.4\r
+\r