[Patch v3 03/15] test: make insert test use the path: prefix

diff --git a/d6/45f1dc2a81b277a5c796bcf2c792a4df5d3734 b/d6/45f1dc2a81b277a5c796bcf2c792a4df5d3734
new file mode 100644 (file)
index 0000000..730d669
--- /dev/null
+++ b/d6/45f1dc2a81b277a5c796bcf2c792a4df5d3734
@@ -0,0 +1,104 @@
+Return-Path: <bremner@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 769B2431FD9\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Mar 2014 13:21:14 -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 r866qJ+aEpIZ for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Mar 2014 13:21:09 -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 09233431FD8\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Mar 2014 13:20:34 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WMOfZ-00058y-F2; Sat, 08 Mar 2014 17:20:33 -0400\r
+Received: (nullmailer pid 28532 invoked by uid 1000); Sat, 08 Mar 2014\r
+       21:20:03 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 03/15] test: make insert test use the path: prefix\r
+Date: Sat,  8 Mar 2014 17:19:33 -0400\r
+Message-Id: <1394313585-28422-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394313585-28422-1-git-send-email-david@tethera.net>\r
+References: <1394313585-28422-1-git-send-email-david@tethera.net>\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: Sat, 08 Mar 2014 21:21:14 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+This is a more strict test for the insert test.\r
+---\r
+ test/T070-insert.sh | 10 +++++-----\r
+ 1 file changed, 5 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index b77c5e1..ea9db07 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -126,14 +126,14 @@ test_expect_equal "$dirname" "$MAIL_DIR/new"\r
+ test_begin_subtest "Insert message into folder"\r
+ gen_insert_msg\r
+ notmuch insert --folder=Drafts < "$gen_msg_filename"\r
+-output=$(notmuch search --output=files folder:Drafts)\r
++output=$(notmuch search --output=files path:Drafts/new)\r
+ dirname=$(dirname "$output")\r
+ test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"\r
+ \r
+ test_begin_subtest "Insert message into folder, add/remove tags"\r
+ gen_insert_msg\r
+ notmuch insert --folder=Drafts +draft -unread < "$gen_msg_filename"\r
+-output=$(notmuch search --output=messages folder:Drafts tag:draft NOT tag:unread)\r
++output=$(notmuch search --output=messages path:Drafts/cur tag:draft NOT tag:unread)\r
+ test_expect_equal "$output" "id:$gen_msg_id"\r
+ \r
+ gen_insert_msg\r
+@@ -143,21 +143,21 @@ test_expect_code 1 "Insert message into non-existent folder" \\r
+ test_begin_subtest "Insert message, create folder"\r
+ gen_insert_msg\r
+ notmuch insert --folder=F --create-folder +folder < "$gen_msg_filename"\r
+-output=$(notmuch search --output=files folder:F tag:folder)\r
++output=$(notmuch search --output=files path:F/new tag:folder)\r
+ basename=$(basename "$output")\r
+ test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/new/${basename}"\r
+ \r
+ test_begin_subtest "Insert message, create subfolder"\r
+ gen_insert_msg\r
+ notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"\r
+-output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)\r
++output=$(notmuch search --output=files path:F/G/H/I/J/new tag:folder)\r
+ basename=$(basename "$output")\r
+ test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/new/${basename}"\r
+ \r
+ test_begin_subtest "Insert message, create existing subfolder"\r
+ gen_insert_msg\r
+ notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"\r
+-output=$(notmuch count folder:F/G/H/I/J tag:folder)\r
++output=$(notmuch count path:F/G/H/I/J/new tag:folder)\r
+ test_expect_equal "$output" "2"\r
+ \r
+ gen_insert_msg\r
+-- \r
+1.8.5.3\r
+\r