[PATCH] test: update insert tests for new maildir synchronization rules

diff --git a/64/bb766ea54d7e7a0aa09446f8cd68daf92fdcd0 b/64/bb766ea54d7e7a0aa09446f8cd68daf92fdcd0
new file mode 100644 (file)
index 0000000..b6041e2
--- /dev/null
+++ b/64/bb766ea54d7e7a0aa09446f8cd68daf92fdcd0
@@ -0,0 +1,96 @@
+Return-Path: <bremner@tethera.net>\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 466BE431FD6\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Sep 2013 18:10:44 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 KZoAUY4Lyue0 for <notmuch@notmuchmail.org>;\r
+       Mon,  2 Sep 2013 18:10:37 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 97698431FD2\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Sep 2013 18:10:37 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1VGf8Z-0002XW-54; Mon, 02 Sep 2013 22:10:31 -0300\r
+Received: (nullmailer pid 3632 invoked by uid 1000); Tue, 03 Sep 2013\r
+       01:10:27 -0000\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: update insert tests for new maildir synchronization\r
+       rules\r
+Date: Mon,  2 Sep 2013 22:10:13 -0300\r
+Message-Id: <1378170613-3584-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.3.2\r
+In-Reply-To: <1355952747-27350-4-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1355952747-27350-4-git-send-email-sojkam1@fel.cvut.cz>\r
+Cc: David Bremner <bremner@debian.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: Tue, 03 Sep 2013 01:10:44 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+As of id:1355952747-27350-4-git-send-email-sojkam1@fel.cvut.cz\r
+we are more conservative about moving messages from ./new to ./cur.\r
+This updates the insert tests to match\r
+---\r
+\r
+Hopefully this makes sense, and is not just papering over a real\r
+problem that should be fixed.\r
+\r
+ test/insert | 6 +++---\r
+ 1 file changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/test/insert b/test/insert\r
+index 021edb6..1718120 100755\r
+--- a/test/insert\r
++++ b/test/insert\r
+@@ -82,7 +82,7 @@ gen_insert_msg\r
+ notmuch insert --folder=Drafts < "$gen_msg_filename"\r
+ output=$(notmuch search --output=files folder:Drafts)\r
+ dirname=$(dirname "$output")\r
+-test_expect_equal "$dirname" "$MAIL_DIR/Drafts/cur"\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
+@@ -99,14 +99,14 @@ 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
++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
+ basename=$(basename "$output")\r
+-test_expect_equal_file "$gen_msg_filename" "${MAIL_DIR}/F/G/H/I/J/cur/${basename}"\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
+-- \r
+1.8.3.2\r
+\r