[PATCH v1 3/3] Test: Fix tests.
authorDavid Edmondson <dme@dme.org>
Tue, 9 Feb 2016 12:23:51 +0000 (12:23 +0000)
committerW. Trevor King <wking@tremily.us>
Sat, 20 Aug 2016 23:21:02 +0000 (16:21 -0700)
23/a5614b727b1b709c8f1d58ea68515bd23428c3 [new file with mode: 0644]

diff --git a/23/a5614b727b1b709c8f1d58ea68515bd23428c3 b/23/a5614b727b1b709c8f1d58ea68515bd23428c3
new file mode 100644 (file)
index 0000000..f976790
--- /dev/null
@@ -0,0 +1,309 @@
+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 arlo.cworth.org (Postfix) with ESMTP id ACF7B6DE1799\r
+ for <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 04:24:01 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.547\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.547 tagged_above=-999 required=5 tests=[AWL=0.614, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652,\r
+ UNPARSEABLE_RELAY=0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id B39_tlKd9IfA for <notmuch@notmuchmail.org>;\r
+ Tue,  9 Feb 2016 04:23:59 -0800 (PST)\r
+Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com\r
+ [74.125.82.42]) by arlo.cworth.org (Postfix) with ESMTPS id 7C2546DE0AC2 for\r
+ <notmuch@notmuchmail.org>; Tue,  9 Feb 2016 04:23:58 -0800 (PST)\r
+Received: by mail-wm0-f42.google.com with SMTP id p63so20747121wmp.1\r
+ for <notmuch@notmuchmail.org>; Tue, 09 Feb 2016 04:23:58 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=dme-org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:subject:date:message-id:in-reply-to:references;\r
+ bh=m6aUwFkmNWQMlXJuxsKSyK/u5lgKaf0CMHuGUxPIb/Q=;\r
+ b=GDGhIXiBx00dE9rP4TyUJkSZCQ215UZCim2mgYTwznJDuzTs4R+jrpLmkLgYQybkEU\r
+ hF96jgWVM8PB0+XeFqNnkiOLKOPnGGe06P0++NCvcayCeN1mZDnsbhglsDghZ3p2/zG7\r
+ goTK0DePAj8EhDviIM9bf7WxEC9H3iycD/9CPhe38BG4Ihx6jeCyUChuIxO5PR73sY3d\r
+ aZe3EZ09QbyUop5k8y5FZvJPOaOvcFZlx/efair9Z2Gq48YDeQAG1Sw+tXw1wfeJofgr\r
+ jADPcGASqm0ZAQRBSapCx2V6kdLjON5BIWde5lZbN3uLS/3HwAjBo+Qh8PJTsm22XXoD\r
+ j3Vg==\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:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=m6aUwFkmNWQMlXJuxsKSyK/u5lgKaf0CMHuGUxPIb/Q=;\r
+ b=anDEwPdi3B2PYMZIff9Q0ue2kdbRbEp5LvjWJTqZtaXW1R35Bn4JPjResdry65c1lq\r
+ vCPYMzV875aLPhxXewDhaspmjQs041O+JcoIgZfQccl0YN8FMN/zxvdjTGziiLknVqhk\r
+ gbZ8GcAAy9KW4Rh4f9OnvhmeWBhbezoWeNlabyvCivlJaRQgDhSOe5AYhKbBJZRBkQvZ\r
+ +6XJ9TQHpQDOBowkFaiadjLgP4diNojR0lrgxHFU9SjCyesboIsrzUsyCHrRUMnUPqIt\r
+ a/nGuJUcj/5zIS21CLMwzvkdmimbuBgMTcWITRTlqstgwnLYcOvIUN/tTKBuoN1j5jpI\r
+ h0Vw==\r
+X-Gm-Message-State:\r
+ AG10YOT+mctGXxHwmRvMjW6SUXxmcYfWZ0li/9zDYKQppz8ISBqnjx9nJEEah11KY/88KA==\r
+X-Received: by 10.194.83.136 with SMTP id q8mr33280978wjy.51.1455020637068;\r
+ Tue, 09 Feb 2016 04:23:57 -0800 (PST)\r
+Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net.\r
+ [81.149.164.25])\r
+ by smtp.gmail.com with ESMTPSA id y188sm17283989wmy.11.2016.02.09.04.23.55\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Tue, 09 Feb 2016 04:23:56 -0800 (PST)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 431e21a7\r
+ for <notmuch@notmuchmail.org>; Tue, 9 Feb 2016 12:23:51 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v1 3/3] Test: Fix tests.\r
+Date: Tue,  9 Feb 2016 12:23:51 +0000\r
+Message-Id: <1455020631-15646-4-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1455020631-15646-1-git-send-email-dme@dme.org>\r
+References: <1455020631-15646-1-git-send-email-dme@dme.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 09 Feb 2016 12:24:01 -0000\r
+\r
+---\r
+ .../notmuch-show-elide-non-matching-messages-off                      | 3 +++\r
+ .../notmuch-show-elide-non-matching-messages-on                       | 3 +++\r
+ .../emacs-show.expected-output/notmuch-show-indent-thread-content-off | 3 +++\r
+ .../notmuch-show-process-crypto-mime-parts-off                        | 1 +\r
+ test/emacs.expected-output/notmuch-show-thread-maildir-storage        | 4 ++++\r
+ .../notmuch-show-thread-maildir-storage-with-fourfold-indentation     | 4 ++++\r
+ .../notmuch-show-thread-maildir-storage-without-indentation           | 4 ++++\r
+ test/tree.expected-output/notmuch-tree-show-window                    | 1 +\r
+ 8 files changed, 23 insertions(+)\r
+\r
+diff --git a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off\r
+index b31fe62..9f1e91f 100644\r
+--- a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off\r
++++ b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-off\r
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+@@ -39,6 +40,7 @@ Cheers,\r
\r
+   [ multipart/mixed ]\r
+   [ multipart/signed ]\r
++  [ Unknown signature status ]\r
+   [ text/plain ]\r
+   > See the patch just posted here.\r
\r
+@@ -65,6 +67,7 @@ Cheers,\r
\r
+     [ multipart/mixed ]\r
+     [ multipart/signed ]\r
++    [ Unknown signature status ]\r
+     [ text/plain ]\r
+     > I've also pushed a slightly more complicated (and complete) fix to my\r
+     > private notmuch repository\r
+diff --git a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on\r
+index bafb479..118053b 100644\r
+--- a/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on\r
++++ b/test/emacs-show.expected-output/notmuch-show-elide-non-matching-messages-on\r
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+@@ -38,6 +39,7 @@ Cheers,\r
\r
+   [ multipart/mixed ]\r
+   [ multipart/signed ]\r
++  [ Unknown signature status ]\r
+   [ text/plain ]\r
+   > See the patch just posted here.\r
\r
+@@ -62,6 +64,7 @@ Cheers,\r
\r
+     [ multipart/mixed ]\r
+     [ multipart/signed ]\r
++    [ Unknown signature status ]\r
+     [ text/plain ]\r
+     > I've also pushed a slightly more complicated (and complete) fix to my\r
+     > private notmuch repository\r
+diff --git a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off\r
+index 37b4f7d..2cb1211 100644\r
+--- a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off\r
++++ b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off\r
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+@@ -39,6 +40,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ > See the patch just posted here.\r
\r
+@@ -65,6 +67,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ > I've also pushed a slightly more complicated (and complete) fix to my\r
+ > private notmuch repository\r
+diff --git a/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off\r
+index 3282c7b..ce2892a 100644\r
+--- a/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off\r
++++ b/test/emacs-show.expected-output/notmuch-show-process-crypto-mime-parts-off\r
+@@ -9,6 +9,7 @@ Subject: [notmuch] Working with Maildir storage?\r
\r
+   [ multipart/mixed ]\r
+   [ multipart/signed ]\r
++  [ Unknown signature status ]\r
+   [ text/plain ]\r
+   > See the patch just posted here.\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..3599892 100644\r
+--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage\r
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+@@ -45,6 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
\r
+  [ multipart/mixed ]\r
+  [ multipart/signed ]\r
++ [ Unknown signature status ]\r
+  [ text/plain ]\r
\r
+  Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did\r
+@@ -77,6 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
\r
+   [ multipart/mixed ]\r
+   [ multipart/signed ]\r
++  [ Unknown signature status ]\r
+   [ text/plain ]\r
+   > See the patch just posted here.\r
\r
+@@ -159,6 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
\r
+     [ multipart/mixed ]\r
+     [ multipart/signed ]\r
++    [ Unknown signature status ]\r
+     [ text/plain ]\r
+     > I've also pushed a slightly more complicated (and complete) fix to my\r
+     > private notmuch repository\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..4721b8b 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
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+@@ -45,6 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
\r
+     [ multipart/mixed ]\r
+     [ multipart/signed ]\r
++    [ Unknown signature status ]\r
+     [ text/plain ]\r
\r
+     Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did\r
+@@ -77,6 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
\r
+       [ multipart/mixed ]\r
+       [ multipart/signed ]\r
++      [ Unknown signature status ]\r
+       [ text/plain ]\r
+       > See the patch just posted here.\r
\r
+@@ -159,6 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch\r
\r
+               [ multipart/mixed ]\r
+               [ multipart/signed ]\r
++              [ Unknown signature status ]\r
+               [ text/plain ]\r
+               > I've also pushed a slightly more complicated (and complete) fix to my\r
+               > private notmuch repository\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..62a4635 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
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+@@ -45,6 +46,7 @@ Date: Wed, 18 Nov 2009 01:02:38 +0600\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
\r
+ Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did\r
+@@ -77,6 +79,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ > See the patch just posted here.\r
\r
+@@ -159,6 +162,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ > I've also pushed a slightly more complicated (and complete) fix to my\r
+ > private notmuch repository\r
+diff --git a/test/tree.expected-output/notmuch-tree-show-window b/test/tree.expected-output/notmuch-tree-show-window\r
+index e16792b..ab7205b 100644\r
+--- a/test/tree.expected-output/notmuch-tree-show-window\r
++++ b/test/tree.expected-output/notmuch-tree-show-window\r
+@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500\r
\r
+ [ multipart/mixed ]\r
+ [ multipart/signed ]\r
++[ Unknown signature status ]\r
+ [ text/plain ]\r
+ I saw the LWN article and decided to take a look at notmuch.  I'm\r
+ currently using mutt and mairix to index and read a collection of\r
+-- \r
+2.1.4\r
+\r