[PATCH 2/5] test: fix insert folder: searches

diff --git a/56/3007fbe41a214364b9d0f955e417ede164aa14 b/56/3007fbe41a214364b9d0f955e417ede164aa14
new file mode 100644 (file)
index 0000000..e65e0d8
--- /dev/null
+++ b/56/3007fbe41a214364b9d0f955e417ede164aa14
@@ -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 72005431FC9\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:33:58 -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 NFOOrHPXNs0u for <notmuch@notmuchmail.org>;\r
+       Thu,  9 Jan 2014 23:31:51 -0800 (PST)\r
+Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com\r
+       [209.85.215.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 9B558431FBC\r
+       for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:31:51 -0800 (PST)\r
+Received: by mail-ea0-f178.google.com with SMTP id d10so1870105eaj.23\r
+       for <notmuch@notmuchmail.org>; Thu, 09 Jan 2014 23:31:50 -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=jyEKxiTt1wmKBQCMPVTCHlmExj4ZqUY/HAz3x3K+2Uo=;\r
+       b=i05n/dNYsrge8KCmygA6bgZSsXh197sq35BXQ4P6sOkN3ZR7kurNSDPU5A+RdHsHm/\r
+       7fDj5TqXitXoyNVdGvvU5TXvGKG2umfGC7QGkNZkh2h68jEndf96Fu+2xcrqexS4YRwO\r
+       vhEENIxiOKW6592uxNH0ZEoJGWkffKHacE952Xn4jVHaewd4ag2/sQrf2ohiX+x3TuX+\r
+       FUVRZ8jlE2zV0mX8RmZaxootR3NDk5SWWHbtjYttoINxMGfkh9/5RsitI3wZGi/4LdLC\r
+       DJ7nvm1Q5FhY10H8AnmE6QrSxys/jjybUxv+7KDnheC+t/0mnKu24RYj39KsXHG37aob\r
+       DmrQ==\r
+X-Gm-Message-State:\r
+ ALoCoQms613rCK9VSgploeyfjuTTTfRDmca9zZPSJzKio1YsHIWFauwYTsyW6vIYO2o/Jr7lvw++\r
+X-Received: by 10.15.26.200 with SMTP id n48mr5668130eeu.46.1389305932874;\r
+       Thu, 09 Jan 2014 14:18:52 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id p45sm9376819eeg.1.2014.01.09.14.18.51\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 09 Jan 2014 14:18:52 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] test: fix insert folder: searches\r
+Date: Fri, 10 Jan 2014 00:18:33 +0200\r
+Message-Id:\r
+ <7eb4b4ee3345e7b166f9dd142435da32ffeffc86.1389304779.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <cover.1389304779.git.jani@nikula.org>\r
+References: <cover.1389304779.git.jani@nikula.org>\r
+In-Reply-To: <cover.1389304779.git.jani@nikula.org>\r
+References: <cover.1389304779.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: Fri, 10 Jan 2014 07:33:59 -0000\r
+\r
+folder: is now boolean prefix.\r
+---\r
+ test/insert | 10 +++++-----\r
+ 1 file changed, 5 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/insert b/test/insert\r
+index e8dc4c0..4bbccd5 100755\r
+--- a/test/insert\r
++++ b/test/insert\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 folder: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 folder: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 folder: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 folder: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 folder:F/G/H/I/J/new tag:folder)\r
+ test_expect_equal "$output" "2"\r
+ \r
+ gen_insert_msg\r
+-- \r
+1.8.5.2\r
+\r