--- /dev/null
+Return-Path: <novalazy@gmail.com>\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 5C3CF431E64\r
+ for <notmuch@notmuchmail.org>; Thu, 24 Jan 2013 04:10:38 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, 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 NGp83as4SlPY for <notmuch@notmuchmail.org>;\r
+ Thu, 24 Jan 2013 04:10:36 -0800 (PST)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+ [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 7B3FB431FD6\r
+ for <notmuch@notmuchmail.org>; Thu, 24 Jan 2013 04:10:14 -0800 (PST)\r
+Received: by mail-pb0-f53.google.com with SMTP id un1so4723223pbc.12\r
+ for <notmuch@notmuchmail.org>; Thu, 24 Jan 2013 04:10:13 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+ :references; bh=vn0tCk0YqrIc2URGHNKFhH7lltf38rbzXtMeSuIyHyI=;\r
+ b=xmFjw/nx1Q0botyXms/DpvAFWqtNvuLLuDrbNh9+/ONH6Nc5hrpCdjA799C6KwOwtQ\r
+ s19gg8efmWuLXF8vn3Iv86TBaLJWtdj+zEywx3aGjxS4XN7WDVNfaQFizCQATBssT2EA\r
+ o3ePhYosb/bf4p7qYwe1pcfB5Difv34XyvbG2J9e2mnew+prFEUY9Jm9WqapH9g+atri\r
+ KPV+W0vdqqFeB4cAtzoTm6QyqwoYW30czm2lyxuIJNWtnj+L0GmpA6HPqjB7BTLQqojE\r
+ YHzJqg0NRdgv1Y09TYk3stPQkv/s/sVLYiu4VX71WyMGhX4ILvw3DqR9md4m4IxWnn4P\r
+ zTpQ==\r
+X-Received: by 10.68.235.1 with SMTP id ui1mr4086703pbc.138.1359029413789;\r
+ Thu, 24 Jan 2013 04:10:13 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+ [220.233.42.215])\r
+ by mx.google.com with ESMTPS id l5sm13754412pax.10.2013.01.24.04.10.11\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Thu, 24 Jan 2013 04:10:13 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 12/12] test: test insert --create-folder option\r
+Date: Thu, 24 Jan 2013 23:08:08 +1100\r
+Message-Id: <1359029288-12132-13-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1359029288-12132-1-git-send-email-novalazy@gmail.com>\r
+References: <1359029288-12132-1-git-send-email-novalazy@gmail.com>\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: Thu, 24 Jan 2013 12:10:38 -0000\r
+\r
+Add tests for notmuch insert --create-folder option.\r
+---\r
+ test/insert | 24 ++++++++++++++++++++++++\r
+ 1 file changed, 24 insertions(+)\r
+\r
+diff --git a/test/insert b/test/insert\r
+index 44e071c..24a61e1 100755\r
+--- a/test/insert\r
++++ b/test/insert\r
+@@ -83,4 +83,28 @@ gen_insert_msg\r
+ test_expect_code 1 "Insert message, non-existent folder" \\r
+ "notmuch insert --folder=nonesuch < $gen_msg_filename"\r
+ \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
++basename=$(basename "$output")\r
++test_expect_equal_file "$gen_msg_filename" "$MAIL_DIR/F/cur/${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
++basename=$(basename "$output")\r
++test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/cur/${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
++test_expect_equal "$output" "2"\r
++\r
++gen_insert_msg\r
++test_expect_code 1 "Insert message, create invalid subfolder" \\r
++ "notmuch insert --folder=../G --create-folder $gen_msg_filename"\r
++\r
+ test_done\r
+-- \r
+1.7.12.1\r
+\r