[PATCH v4 05/13] test: make insert test use the path: prefix

diff --git a/50/2d864775bf140526b8615a010635f43d1ab239 b/50/2d864775bf140526b8615a010635f43d1ab239
new file mode 100644 (file)
index 0000000..861db04
--- /dev/null
+++ b/50/2d864775bf140526b8615a010635f43d1ab239
@@ -0,0 +1,124 @@
+Return-Path: <jani@nikula.org>\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 1B031431FC2\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 14:41:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 0FUhp-Lzv+GL for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Mar 2014 14:41:15 -0700 (PDT)\r
+Received: from mail-la0-f50.google.com (mail-la0-f50.google.com\r
+       [209.85.215.50]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6D448431FD2\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Mar 2014 14:40:52 -0700 (PDT)\r
+Received: by mail-la0-f50.google.com with SMTP id y1so4116527lam.37\r
+       for <notmuch@notmuchmail.org>; Sun, 09 Mar 2014 14:40:51 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+       :references:in-reply-to:references;\r
+       bh=3GQNnolPfjkpUl2rhF7DeR0Imw41AIIKbLA7J/KTrnc=;\r
+       b=j8PSj5OtznnWTbTcHyaNyQt1sS4YveH8PmwGp+p5UqC5yCFwi9YhwS1/uhWT+/AFtP\r
+       zoT+w+Qo464ZF2DXlXQvh7CwNB0Q2CVPheMhTmvDQSzHINFhnCdqOb6BfAUmSXwRloHN\r
+       GEFcs+30DNlWyVgw8m3E88EIGUO1p7O3BCNhgGjHIYEFSU5y5MBe4oTDUreeyar4zZni\r
+       3+BfwMvv2muTUBleRjn/dcqiwchcdCMU0jgRm/liXd94H8xBxLfLNxt1ZsndMjvRk8gd\r
+       3BKnCGk15Ok2ibMk/xj40IsD0CpWgcE/d/7CfTRH10IOA6JnVEqfJk8IGPCUy82xP/En\r
+       ESPw==\r
+X-Gm-Message-State:\r
+ ALoCoQkRIeWRaupJP/08TxzsF4dCXu1ataS6apf6PU8kdjvRTlUOi7mZ/IrjQ8BKhIkby6krCDit\r
+X-Received: by 10.152.23.39 with SMTP id j7mr7090130laf.35.1394401249874;\r
+       Sun, 09 Mar 2014 14:40:49 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id sx1sm26916600lac.1.2014.03.09.14.40.48\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 09 Mar 2014 14:40:49 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 05/13] test: make insert test use the path: prefix\r
+Date: Sun,  9 Mar 2014 23:40:26 +0200\r
+Message-Id:\r
+ <5b766663f139acec8448cb38dcfc8b6358bcc6bc.1394400503.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.git.jani@nikula.org>\r
+In-Reply-To: <cover.1394400503.git.jani@nikula.org>\r
+References: <cover.1394400503.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: Sun, 09 Mar 2014 21:41:21 -0000\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 b77c5e13c87f..ea9db07e2fa2 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.9.0\r
+\r