[PATCH v2 03/13] test: make insert test use the path: prefix

diff --git a/f3/70e5a6574469dcce9651ed9149e6e5fee95322 b/f3/70e5a6574469dcce9651ed9149e6e5fee95322
new file mode 100644 (file)
index 0000000..483fda0
--- /dev/null
+++ b/f3/70e5a6574469dcce9651ed9149e6e5fee95322
@@ -0,0 +1,123 @@
+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 3CEFD431FDC\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:26:05 -0800 (PST)\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 NlM91JNGYDZb for <notmuch@notmuchmail.org>;\r
+       Sat, 22 Feb 2014 14:26:00 -0800 (PST)\r
+Received: from mail-ea0-f179.google.com (mail-ea0-f179.google.com\r
+       [209.85.215.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CAB54431FCF\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:56 -0800 (PST)\r
+Received: by mail-ea0-f179.google.com with SMTP id q10so2303975ead.24\r
+       for <notmuch@notmuchmail.org>; Sat, 22 Feb 2014 14:25:54 -0800 (PST)\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=bAiHRWWjZsaElIhfrkzflCVDZxrmhvUGvplkzBUpNM0=;\r
+       b=cyQ5OYgNDNn8FXLtSCPLYKV9bAVntDeNMBfVgHoNAj7i1Y/7klbhru8mQ+TUDOWhk1\r
+       8NcNLD85PR7Cq08M6VNDhsKZ+bHzpMTfa2aT6zrmpk/i1J4tEuJWK+F0ZmANhbab3Kun\r
+       KaPFzyw1qUtP+wSkjaxkQc9bC13CwyqpdGNxdwnnd0cNu0upLwyGvHBXRtF1nBC7hx+L\r
+       58KohMIOXKfipIOUBtGvOKvTGL0RMBfI4cEfhcVAEF5i/APaT00KYq/VdqCe9F/JXIT5\r
+       5Zj6GwDix/Ow90jtkp4ga40xsiHBlVKvmKGDz+/JLOLUX60xJcOZqZ4zGqHzEI2T8fF9\r
+       QU+w==\r
+X-Gm-Message-State:\r
+ ALoCoQlhlTuN7YaKzkWZsBCQ4WipEngLnUfSV5SIcMa3ITQUCC60flB8qiACxCHHqiF5GaEEq5GX\r
+X-Received: by 10.14.3.72 with SMTP id 48mr16660498eeg.34.1393107954219;\r
+       Sat, 22 Feb 2014 14:25:54 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+       j42sm43781823eep.21.2014.02.22.14.25.53 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 22 Feb 2014 14:25:53 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 03/13] test: make insert test use the path: prefix\r
+Date: Sun, 23 Feb 2014 00:25:34 +0200\r
+Message-Id:\r
+ <d957fb15689885b21a12fed8fa5563df26e121e8.1393105055.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.git.jani@nikula.org>\r
+In-Reply-To: <cover.1393105055.git.jani@nikula.org>\r
+References: <cover.1393105055.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: Sat, 22 Feb 2014 22:26:05 -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 e8dc4c099ed1..5de5da43cebb 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