[PATCH 1/2] test: add more maildir flag syncing related tests to insert

diff --git a/f1/f5a57e2657695bd0398672e559c27d2d5ee625 b/f1/f5a57e2657695bd0398672e559c27d2d5ee625
new file mode 100644 (file)
index 0000000..458c5ff
--- /dev/null
+++ b/f1/f5a57e2657695bd0398672e559c27d2d5ee625
@@ -0,0 +1,125 @@
+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 47C17431FDD\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Sep 2013 22:19:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 OsW+z99tYvuv for <notmuch@notmuchmail.org>;\r
+       Mon,  2 Sep 2013 22:19:08 -0700 (PDT)\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 B4885431FDA\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Sep 2013 22:19:07 -0700 (PDT)\r
+Received: by mail-ea0-f178.google.com with SMTP id a15so2700219eae.23\r
+       for <notmuch@notmuchmail.org>; Mon, 02 Sep 2013 22:19:05 -0700 (PDT)\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;\r
+       bh=9efQWUv8kZBoF238XjhU7LhyXNViPrzp2PHBNofGecQ=;\r
+       b=Rme2ylUxuGVbaznUU7Ffn4bLbnFwrzta/8dg1aklBwsf8LPPHfEBTVn1/f6nhiFBoC\r
+       x0YGFGhYciGgSOI6PNDQtNRjOKX+mRQ6PDNy9iCMQqoxa5f6ACnjuelA3OumfCoCT/7R\r
+       TSX/WDCi45hqeDnlTiXBnMkFc/TFvi43HFbaLPcuEcxQyaK24OOBnAfZzF499CC8zVPv\r
+       PPCswEP3Ycx/yh9c1xBSZIDK+G79owdHvcElzQVzwb4hSZXCO7b74ryTfJvIcGExJDaj\r
+       gwRWsJvTZ38/NlcvWj6vgPNM1vqkImPQ1uy7zS8XkK5rfOwjbJzxOuawBU0Zl3mmozT9\r
+       sbKg==\r
+X-Gm-Message-State:\r
+ ALoCoQkyn4X/3ustqCSSOHcvvx/jzcU9n2NExzJFpme18jdVNHdYvKjMH03hxmNXqLj3b7PIcTLL\r
+X-Received: by 10.14.87.135 with SMTP id y7mr507546eee.69.1378185544527;\r
+       Mon, 02 Sep 2013 22:19:04 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id b45sm28227805eef.4.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Mon, 02 Sep 2013 22:19:03 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] test: add more maildir flag syncing related tests to\r
+       insert\r
+Date: Tue,  3 Sep 2013 08:19:02 +0300\r
+Message-Id: <1378185543-25271-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1378170613-3584-1-git-send-email-david@tethera.net>\r
+References: <1378170613-3584-1-git-send-email-david@tethera.net>\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 05:19:17 -0000\r
+\r
+Specifically test maildir flag syncing with insert.\r
+\r
+---\r
+\r
+These are additional tests on top of David's fix.\r
+---\r
+ test/insert | 36 ++++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 36 insertions(+)\r
+\r
+diff --git a/test/insert b/test/insert\r
+index 1718120..9b448e5 100755\r
+--- a/test/insert\r
++++ b/test/insert\r
+@@ -77,6 +77,42 @@ notmuch insert +custom -unread < "$gen_msg_filename"\r
+ output=$(notmuch count tag:custom NOT tag:unread)\r
+ test_expect_equal "$output" "1"\r
+ \r
++test_begin_subtest "Insert message with default tags stays in new/"\r
++gen_insert_msg\r
++notmuch insert < "$gen_msg_filename"\r
++output=$(notmuch search --output=files id:$gen_msg_id)\r
++dirname=$(dirname "$output")\r
++test_expect_equal "$dirname" "$MAIL_DIR/new"\r
++\r
++test_begin_subtest "Insert message with non-maildir synced tags stays in new/"\r
++gen_insert_msg\r
++notmuch insert +custom -inbox < "$gen_msg_filename"\r
++output=$(notmuch search --output=files id:$gen_msg_id)\r
++dirname=$(dirname "$output")\r
++test_expect_equal "$dirname" "$MAIL_DIR/new"\r
++\r
++test_begin_subtest "Insert message with custom new.tags goes to cur/"\r
++OLDCONFIG=$(notmuch config get new.tags)\r
++notmuch config set new.tags test\r
++gen_insert_msg\r
++notmuch insert < "$gen_msg_filename"\r
++output=$(notmuch search --output=files id:$gen_msg_id)\r
++dirname=$(dirname "$output")\r
++notmuch config set new.tags $OLDCONFIG\r
++test_expect_equal "$dirname" "$MAIL_DIR/cur"\r
++\r
++# additional check on the previous message\r
++test_begin_subtest "Insert message with custom new.tags actually gets the tags"\r
++output=$(notmuch search --output=tags id:$gen_msg_id)\r
++test_expect_equal "$output" "test"\r
++\r
++test_begin_subtest "Insert message with maildir synced tags goes to cur/"\r
++gen_insert_msg\r
++notmuch insert +flagged < "$gen_msg_filename"\r
++output=$(notmuch search --output=files id:$gen_msg_id)\r
++dirname=$(dirname "$output")\r
++test_expect_equal "$dirname" "$MAIL_DIR/cur"\r
++\r
+ test_begin_subtest "Insert message into folder"\r
+ gen_insert_msg\r
+ notmuch insert --folder=Drafts < "$gen_msg_filename"\r
+-- \r
+1.8.4.rc3\r
+\r