[PATCH v7 06/12] test: add tests for insert

diff --git a/f9/3fc805c4f3465a839903cdd6621cd137dedb0e b/f9/3fc805c4f3465a839903cdd6621cd137dedb0e
new file mode 100644 (file)
index 0000000..9658b99
--- /dev/null
+++ b/f9/3fc805c4f3465a839903cdd6621cd137dedb0e
@@ -0,0 +1,171 @@
+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 6F15D431FC3\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Jun 2013 21:24:50 -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 Mw0ZsCeHxORe for <notmuch@notmuchmail.org>;\r
+       Sat, 22 Jun 2013 21:24:44 -0700 (PDT)\r
+Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com\r
+       [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1832E431FD9\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Jun 2013 21:24:27 -0700 (PDT)\r
+Received: by mail-pa0-f53.google.com with SMTP id tj12so9508224pac.26\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Jun 2013 21:24:26 -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:x-mailer:in-reply-to:references;\r
+       bh=cFI8tSe6Eyh8rSOCGhbSQ1elpywalxWY/JUiJJMe/y0=;\r
+       b=Z7yPj4I9a7Z8EW7liAcAlvL7QJpONWfU6oIaWMWOdO8a11eDcjxV3ZDkbYfOlqjL4A\r
+       TI1b8KIOcRnYhq6L7YodrD0JTLIBdViQOvJ/n3rJhT8PptrXNjZb/SvgREKu21MQPfVL\r
+       EPpWMnpayf3w4fBiR4xY7z19nCYHbbB6MzerfsKUs7BDjK+R0Rvi7nPyAUvoSglIlw1U\r
+       iM70KtYyUFOXWw3DMa2ogiFkW+GvVVB8xLNd/t9h/NjTfPyflQk69TegqFYLicuJdbqR\r
+       mELJLfh0+zPf2udRXBlKiJdeOi6WOsQmp6aGVH13XvnG/aEQ1hFDAQ3vypVVslD6VADS\r
+       d+UQ==\r
+X-Received: by 10.68.163.165 with SMTP id yj5mr18664245pbb.141.1371961466406; \r
+       Sat, 22 Jun 2013 21:24:26 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPSA id kc8sm5959463pbc.18.2013.06.22.21.24.24\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 22 Jun 2013 21:24:25 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v7 06/12] test: add tests for insert\r
+Date: Sun, 23 Jun 2013 14:23:59 +1000\r
+Message-Id: <1371961445-15182-7-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1371961445-15182-1-git-send-email-novalazy@gmail.com>\r
+References: <1371961445-15182-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: Sun, 23 Jun 2013 04:24:50 -0000\r
+\r
+Add tests for new 'insert' command.\r
+---\r
+ test/insert       | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ test/notmuch-test |  1 +\r
+ 2 files changed, 81 insertions(+)\r
+ create mode 100755 test/insert\r
+\r
+diff --git a/test/insert b/test/insert\r
+new file mode 100755\r
+index 0000000..b432a74\r
+--- /dev/null\r
++++ b/test/insert\r
+@@ -0,0 +1,80 @@\r
++#!/usr/bin/env bash\r
++test_description='"notmuch insert"'\r
++. ./test-lib.sh\r
++\r
++# Create directories and database before inserting.\r
++mkdir -p "$MAIL_DIR"/{cur,new,tmp}\r
++mkdir -p "$MAIL_DIR"/Drafts/{cur,new,tmp}\r
++notmuch new > /dev/null\r
++\r
++# We use generate_message to create the temporary message files.\r
++# They happen to be in the mail directory already but that is okay\r
++# since we do not call notmuch new hereafter.\r
++\r
++gen_insert_msg() {\r
++    generate_message \\r
++      "[subject]=\"insert-subject\"" \\r
++      "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" \\r
++      "[body]=\"insert-message\""\r
++}\r
++\r
++test_expect_code 1 "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
++    "echo bad_message | notmuch insert"\r
++\r
++test_begin_subtest "Database empty so far"\r
++test_expect_equal "0" "`notmuch count --output=messages '*'`"\r
++\r
++test_begin_subtest "Insert message"\r
++gen_insert_msg\r
++notmuch insert < "$gen_msg_filename"\r
++cur_msg_filename=$(notmuch search --output=files "subject:insert-subject")\r
++test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename"\r
++\r
++test_begin_subtest "Insert message adds default tags"\r
++output=$(notmuch show --format=json "subject:insert-subject")\r
++expected='[[[{\r
++ "id": "'"${gen_msg_id}"'",\r
++ "match": true,\r
++ "excluded": false,\r
++ "filename": "'"${cur_msg_filename}"'",\r
++ "timestamp": 946728000,\r
++ "date_relative": "2000-01-01",\r
++ "tags": ["inbox","unread"],\r
++ "headers": {\r
++  "Subject": "insert-subject",\r
++  "From": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++  "To": "Notmuch Test Suite <test_suite@notmuchmail.org>",\r
++  "Date": "Sat, 01 Jan 2000 12:00:00 +0000"},\r
++ "body": [{"id": 1,\r
++  "content-type": "text/plain",\r
++  "content": "insert-message\n"}]},\r
++ []]]]'\r
++test_expect_equal_json "$output" "$expected"\r
++\r
++test_begin_subtest "Insert duplicate message"\r
++notmuch insert +duptag -unread < "$gen_msg_filename"\r
++output=$(notmuch search --output=files "subject:insert-subject" | wc -l)\r
++test_expect_equal "$output" 2\r
++\r
++test_begin_subtest "Duplicate message does not change tags"\r
++output=$(notmuch search --format=json --output=tags "subject:insert-subject")\r
++test_expect_equal_json "$output" '["inbox", "unread"]'\r
++\r
++test_begin_subtest "Insert message, add tag"\r
++gen_insert_msg\r
++notmuch insert +custom < "$gen_msg_filename"\r
++output=$(notmuch count tag:custom)\r
++test_expect_equal "$output" "1"\r
++\r
++test_begin_subtest "Insert message, add/remove tags"\r
++gen_insert_msg\r
++notmuch insert +custom -unread < "$gen_msg_filename"\r
++output=$(notmuch count tag:custom NOT tag:unread)\r
++test_expect_equal "$output" "1"\r
++\r
++test_done\r
+diff --git a/test/notmuch-test b/test/notmuch-test\r
+index a0c47d4..6db7979 100755\r
+--- a/test/notmuch-test\r
++++ b/test/notmuch-test\r
+@@ -23,6 +23,7 @@ TESTS="\r
+   setup\r
+   new\r
+   count\r
++  insert\r
+   search\r
+   search-output\r
+   search-by-folder\r
+-- \r
+1.7.12.1\r
+\r