Return-Path: <jani@nikula.org>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 72005431FC9
	for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:33:58 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
X-Spam-Flag: NO
X-Spam-Score: -0.7
X-Spam-Level: 
X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id NFOOrHPXNs0u for <notmuch@notmuchmail.org>;
	Thu,  9 Jan 2014 23:31:51 -0800 (PST)
Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com
	[209.85.215.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 9B558431FBC
	for <notmuch@notmuchmail.org>; Thu,  9 Jan 2014 23:31:51 -0800 (PST)
Received: by mail-ea0-f178.google.com with SMTP id d10so1870105eaj.23
	for <notmuch@notmuchmail.org>; Thu, 09 Jan 2014 23:31:50 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:in-reply-to:references;
	bh=jyEKxiTt1wmKBQCMPVTCHlmExj4ZqUY/HAz3x3K+2Uo=;
	b=i05n/dNYsrge8KCmygA6bgZSsXh197sq35BXQ4P6sOkN3ZR7kurNSDPU5A+RdHsHm/
	7fDj5TqXitXoyNVdGvvU5TXvGKG2umfGC7QGkNZkh2h68jEndf96Fu+2xcrqexS4YRwO
	vhEENIxiOKW6592uxNH0ZEoJGWkffKHacE952Xn4jVHaewd4ag2/sQrf2ohiX+x3TuX+
	FUVRZ8jlE2zV0mX8RmZaxootR3NDk5SWWHbtjYttoINxMGfkh9/5RsitI3wZGi/4LdLC
	DJ7nvm1Q5FhY10H8AnmE6QrSxys/jjybUxv+7KDnheC+t/0mnKu24RYj39KsXHG37aob
	DmrQ==
X-Gm-Message-State:
 ALoCoQms613rCK9VSgploeyfjuTTTfRDmca9zZPSJzKio1YsHIWFauwYTsyW6vIYO2o/Jr7lvw++
X-Received: by 10.15.26.200 with SMTP id n48mr5668130eeu.46.1389305932874;
	Thu, 09 Jan 2014 14:18:52 -0800 (PST)
Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
	[88.195.111.91])
	by mx.google.com with ESMTPSA id p45sm9376819eeg.1.2014.01.09.14.18.51
	for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Thu, 09 Jan 2014 14:18:52 -0800 (PST)
From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/5] test: fix insert folder: searches
Date: Fri, 10 Jan 2014 00:18:33 +0200
Message-Id:
 <7eb4b4ee3345e7b166f9dd142435da32ffeffc86.1389304779.git.jani@nikula.org>
X-Mailer: git-send-email 1.8.5.2
In-Reply-To: <cover.1389304779.git.jani@nikula.org>
References: <cover.1389304779.git.jani@nikula.org>
In-Reply-To: <cover.1389304779.git.jani@nikula.org>
References: <cover.1389304779.git.jani@nikula.org>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Jan 2014 07:33:59 -0000

folder: is now boolean prefix.
---
 test/insert | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/insert b/test/insert
index e8dc4c0..4bbccd5 100755
--- a/test/insert
+++ b/test/insert
@@ -126,14 +126,14 @@ test_expect_equal "$dirname" "$MAIL_DIR/new"
 test_begin_subtest "Insert message into folder"
 gen_insert_msg
 notmuch insert --folder=Drafts < "$gen_msg_filename"
-output=$(notmuch search --output=files folder:Drafts)
+output=$(notmuch search --output=files folder:Drafts/new)
 dirname=$(dirname "$output")
 test_expect_equal "$dirname" "$MAIL_DIR/Drafts/new"
 
 test_begin_subtest "Insert message into folder, add/remove tags"
 gen_insert_msg
 notmuch insert --folder=Drafts +draft -unread < "$gen_msg_filename"
-output=$(notmuch search --output=messages folder:Drafts tag:draft NOT tag:unread)
+output=$(notmuch search --output=messages folder:Drafts/cur tag:draft NOT tag:unread)
 test_expect_equal "$output" "id:$gen_msg_id"
 
 gen_insert_msg
@@ -143,21 +143,21 @@ test_expect_code 1 "Insert message into non-existent folder" \
 test_begin_subtest "Insert message, create folder"
 gen_insert_msg
 notmuch insert --folder=F --create-folder +folder < "$gen_msg_filename"
-output=$(notmuch search --output=files folder:F tag:folder)
+output=$(notmuch search --output=files folder:F/new tag:folder)
 basename=$(basename "$output")
 test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/new/${basename}"
 
 test_begin_subtest "Insert message, create subfolder"
 gen_insert_msg
 notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"
-output=$(notmuch search --output=files folder:F/G/H/I/J tag:folder)
+output=$(notmuch search --output=files folder:F/G/H/I/J/new tag:folder)
 basename=$(basename "$output")
 test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/new/${basename}"
 
 test_begin_subtest "Insert message, create existing subfolder"
 gen_insert_msg
 notmuch insert --folder=F/G/H/I/J --create-folder +folder < "$gen_msg_filename"
-output=$(notmuch count folder:F/G/H/I/J tag:folder)
+output=$(notmuch count folder:F/G/H/I/J/new tag:folder)
 test_expect_equal "$output" "2"
 
 gen_insert_msg
-- 
1.8.5.2