[PATCH 2/2] test: Update tests for new 'Tags' header.

diff --git a/0a/e55cae18ddf04f59cacdbee8c9e60d0ba7b1d3 b/0a/e55cae18ddf04f59cacdbee8c9e60d0ba7b1d3
new file mode 100644 (file)
index 0000000..2ae51cd
--- /dev/null
+++ b/0a/e55cae18ddf04f59cacdbee8c9e60d0ba7b1d3
@@ -0,0 +1,272 @@
+Return-Path: <dme@dme.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 79FD5431FD6\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Jan 2012 10:16:41 -0800 (PST)\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 XOZXb1ETuWZf for <notmuch@notmuchmail.org>;\r
+       Thu, 26 Jan 2012 10:16:38 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ AB930431FAF   for <notmuch@notmuchmail.org>; Thu, 26 Jan 2012 10:16:36 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so816617wgb.2\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Jan 2012 10:16:34 -0800 (PST)\r
+Received: by 10.180.83.104 with SMTP id p8mr6281194wiy.4.1327601793865;\r
+       Thu, 26 Jan 2012 10:16:33 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id m8sm14966901wia.11.2012.01.26.10.16.32\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 26 Jan 2012 10:16:32 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id DC335A0502; Thu, 26 Jan 2012 18:16:30 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: Update tests for new 'Tags' header.\r
+Date: Thu, 26 Jan 2012 18:16:29 +0000\r
+Message-Id: <1327601789-6040-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327601789-6040-1-git-send-email-dme@dme.org>\r
+References: <1327601789-6040-1-git-send-email-dme@dme.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: Thu, 26 Jan 2012 18:16:42 -0000\r
+\r
+---\r
+ test/emacs                                         |    3 +++\r
+ .../notmuch-show-thread-maildir-storage            |    7 +++++++\r
+ ...hread-maildir-storage-with-fourfold-indentation |    7 +++++++\r
+ ...show-thread-maildir-storage-without-indentation |    7 +++++++\r
+ 4 files changed, 24 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index f150d95..eda5438 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -82,6 +82,7 @@ cat <<EOF >EXPECTED\r
+ Subject: message-with-invalid-from\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Date: Fri, 05 Jan 2001 15:43:57 +0000\r
++Tags: inbox\r
+ \r
+ This is just a test message (#1)\r
+ EOF\r
+@@ -332,6 +333,7 @@ echo "Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox)\r
+ Subject: The problem with top-posting\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Date: Fri, 05 Jan 2001 15:43:57 +0000\r
++Tags: inbox\r
+ \r
+ A: Because it messes up the order in which people normally read text.\r
+ Q: Why is top-posting such a bad thing?\r
+@@ -341,6 +343,7 @@ Top Poster <top@poster.com> (2001-01-05) (inbox unread)\r
+ Subject: Re: The problem with top-posting\r
+ To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+ Date: Fri, 05 Jan 2001 15:43:57 +0000\r
++Tags: inbox unread\r
+ \r
+ Thanks for the advice! I will be sure to put it to good use.\r
+ \r
+diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
+index cdbfa1d..3e7d3fb 100644\r
+--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
+@@ -2,6 +2,7 @@ Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)\r
+ Subject: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
++Tags: inbox signed\r
+ \r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
+@@ -42,6 +43,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+  Subject: Re: [notmuch] Working with Maildir storage?\r
+  To: notmuch@notmuchmail.org\r
+  Date: Wed, 18 Nov 2009 01:02:38 +0600\r
++ Tags: inbox signed unread\r
+ \r
+  [ multipart/mixed ]\r
+  [ multipart/signed ]\r
+@@ -74,6 +76,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+   To: Mikhail Gusarov <dottedmag@dottedmag.net>\r
+   Cc: notmuch@notmuchmail.org\r
+   Date: Tue, 17 Nov 2009 15:33:01 -0500\r
++  Tags: inbox signed unread\r
+ \r
+   [ multipart/mixed ]\r
+   [ multipart/signed ]\r
+@@ -105,6 +108,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+    Subject: [notmuch] Working with Maildir storage?\r
+    To: notmuch@notmuchmail.org\r
+    Date: Wed, 18 Nov 2009 02:50:48 +0600\r
++   Tags: inbox unread\r
+ \r
+    Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu\r
+    did gyre and gimble:\r
+@@ -133,6 +137,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+    Subject: [notmuch] Working with Maildir storage?\r
+    To: notmuch@notmuchmail.org\r
+    Date: Tue, 17 Nov 2009 13:24:13 -0800\r
++   Tags: inbox unread\r
+ \r
+    On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at\r
+    seas.harvard.edu> wrote:\r
+@@ -156,6 +161,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+     To: Keith Packard <keithp@keithp.com>\r
+     Cc: notmuch@notmuchmail.org\r
+     Date: Tue, 17 Nov 2009 19:50:40 -0500\r
++    Tags: inbox signed unread\r
+ \r
+     [ multipart/mixed ]\r
+     [ multipart/signed ]\r
+@@ -182,6 +188,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+  Subject: [notmuch] Working with Maildir storage?\r
+  To: notmuch@notmuchmail.org\r
+  Date: Wed, 18 Nov 2009 02:08:10 -0800\r
++ Tags: inbox unread\r
+ \r
+  On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at\r
+  seas.harvard.edu> wrote:\r
+diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation\r
+index b0bf93e..6245c2e 100644\r
+--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation\r
++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-with-fourfold-indentation\r
+@@ -2,6 +2,7 @@ Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)\r
+ Subject: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
++Tags: inbox signed\r
+ \r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
+@@ -42,6 +43,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+     Subject: Re: [notmuch] Working with Maildir storage?\r
+     To: notmuch@notmuchmail.org\r
+     Date: Wed, 18 Nov 2009 01:02:38 +0600\r
++    Tags: inbox signed unread\r
+ \r
+     [ multipart/mixed ]\r
+     [ multipart/signed ]\r
+@@ -74,6 +76,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+       To: Mikhail Gusarov <dottedmag@dottedmag.net>\r
+       Cc: notmuch@notmuchmail.org\r
+       Date: Tue, 17 Nov 2009 15:33:01 -0500\r
++      Tags: inbox signed unread\r
+ \r
+       [ multipart/mixed ]\r
+       [ multipart/signed ]\r
+@@ -105,6 +108,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+           Subject: [notmuch] Working with Maildir storage?\r
+           To: notmuch@notmuchmail.org\r
+           Date: Wed, 18 Nov 2009 02:50:48 +0600\r
++          Tags: inbox unread\r
+ \r
+           Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu\r
+           did gyre and gimble:\r
+@@ -133,6 +137,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+           Subject: [notmuch] Working with Maildir storage?\r
+           To: notmuch@notmuchmail.org\r
+           Date: Tue, 17 Nov 2009 13:24:13 -0800\r
++          Tags: inbox unread\r
+ \r
+           On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at\r
+           seas.harvard.edu> wrote:\r
+@@ -156,6 +161,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+               To: Keith Packard <keithp@keithp.com>\r
+               Cc: notmuch@notmuchmail.org\r
+               Date: Tue, 17 Nov 2009 19:50:40 -0500\r
++              Tags: inbox signed unread\r
+ \r
+               [ multipart/mixed ]\r
+               [ multipart/signed ]\r
+@@ -182,6 +188,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
+     Subject: [notmuch] Working with Maildir storage?\r
+     To: notmuch@notmuchmail.org\r
+     Date: Wed, 18 Nov 2009 02:08:10 -0800\r
++    Tags: inbox unread\r
+ \r
+     On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at\r
+     seas.harvard.edu> wrote:\r
+diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation\r
+index 08de8b5..17214f7 100644\r
+--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation\r
++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation\r
+@@ -2,6 +2,7 @@ Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)\r
+ Subject: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
++Tags: inbox signed\r
+ \r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
+@@ -42,6 +43,7 @@ Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox signed unread)\r
+ Subject: Re: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Wed, 18 Nov 2009 01:02:38 +0600\r
++Tags: inbox signed unread\r
+ \r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
+@@ -74,6 +76,7 @@ Subject: Re: [notmuch] Working with Maildir storage?\r
+ To: Mikhail Gusarov <dottedmag@dottedmag.net>\r
+ Cc: notmuch@notmuchmail.org\r
+ Date: Tue, 17 Nov 2009 15:33:01 -0500\r
++Tags: inbox signed unread\r
+ \r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
+@@ -105,6 +108,7 @@ Mikhail Gusarov <dottedmag@dottedmag.net> (2009-11-17) (inbox unread)\r
+ Subject: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Wed, 18 Nov 2009 02:50:48 +0600\r
++Tags: inbox unread\r
+ \r
+ Twas brillig at 15:33:01 17.11.2009 UTC-05 when lars at seas.harvard.edu\r
+ did gyre and gimble:\r
+@@ -133,6 +137,7 @@ Keith Packard <keithp@keithp.com> (2009-11-17) (inbox unread)\r
+ Subject: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Tue, 17 Nov 2009 13:24:13 -0800\r
++Tags: inbox unread\r
+ \r
+ On Tue, 17 Nov 2009 15:33:01 -0500, Lars Kellogg-Stedman <lars at\r
+ seas.harvard.edu> wrote:\r
+@@ -156,6 +161,7 @@ Subject: Re: [notmuch] Working with Maildir storage?\r
+ To: Keith Packard <keithp@keithp.com>\r
+ Cc: notmuch@notmuchmail.org\r
+ Date: Tue, 17 Nov 2009 19:50:40 -0500\r
++Tags: inbox signed unread\r
+ \r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
+@@ -182,6 +188,7 @@ Carl Worth <cworth@cworth.org> (2009-11-18) (inbox unread)\r
+ Subject: [notmuch] Working with Maildir storage?\r
+ To: notmuch@notmuchmail.org\r
+ Date: Wed, 18 Nov 2009 02:08:10 -0800\r
++Tags: inbox unread\r
+ \r
+ On Tue, 17 Nov 2009 14:00:54 -0500, Lars Kellogg-Stedman <lars at\r
+ seas.harvard.edu> wrote:\r
+-- \r
+1.7.8.3\r
+\r