[PATCH v2 2/2] Test: Fix tests.
authorDavid Edmondson <dme@dme.org>
Sun, 3 Apr 2016 15:38:23 +0000 (16:38 +0100)
committerW. Trevor King <wking@tremily.us>
Sat, 20 Aug 2016 23:21:28 +0000 (16:21 -0700)
96/48f6d55adba82e74aecc3a8ecc931d05d2e709 [new file with mode: 0644]

diff --git a/96/48f6d55adba82e74aecc3a8ecc931d05d2e709 b/96/48f6d55adba82e74aecc3a8ecc931d05d2e709
new file mode 100644 (file)
index 0000000..72e48b8
--- /dev/null
@@ -0,0 +1,325 @@
+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 3EDAE6DE034D\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 08:38:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.161\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.161 tagged_above=-999 required=5\r
+ tests=[AWL=-0.094, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001]\r
+ 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 e7pbEBciqePV for <notmuch@notmuchmail.org>;\r
+ Sun,  3 Apr 2016 08:38:39 -0700 (PDT)\r
+Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com\r
+ [209.85.215.65])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id B5D426DE0159\r
+ for <notmuch@notmuchmail.org>; Sun,  3 Apr 2016 08:38:30 -0700 (PDT)\r
+Received: by mail-lf0-f65.google.com with SMTP id p81so13437467lfb.3\r
+ for <notmuch@notmuchmail.org>; Sun, 03 Apr 2016 08:38:30 -0700 (PDT)\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=FnnStD7OAyey4J4FqC35pVSGVTULOeXaXehkuqy7Zac=;\r
+ b=GaoMQlqRL6EVn3s3SRbkUUSRkbCKgla9nmiM/ITZO2FEk7KyrZMqYdXO53MBu9zHM2\r
+ qMSBJVpCWZEr9sHm5UkmxUCdNN1smtuyBJFdCuF4lLkqJO0S2iCSyrTDJ/RxOGdDDHzY\r
+ cjyuWre/OtFDY0/G79Skt0pUMxGf1/YgZfNizdUHCPFWKL0sHyXaHZCjV70rtXVqFm9J\r
+ Kx1001PJiv/yk756HTZL/DyrTaDrsPVK3DJXmFbhnVtUP6yYX05lK7De9lDeUZmBwAOu\r
+ qkksDk4uy2263mcNBnulLNJTV+YhDEex1Qu6CLYoEVr2vO+1gzKBHw6nYJ+r8iKkHsvc\r
+ cOHA==\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=FnnStD7OAyey4J4FqC35pVSGVTULOeXaXehkuqy7Zac=;\r
+ b=MxemZORW8aQDI2xzAKxQ8DYlxCiocRSot/ZgXGNhGCl+nL1AAze69Qp9DUNSNCqHq0\r
+ QkjApzKLwYOljeA/2npW6ooECFm4KuEkuG0G609ACGKoi5n7KPO071F6Oz2nn5aCrV2f\r
+ 4mOPlI+LLCvMybJ7Kq2MvlQApdy8Vnidwjqvz0Yu9awcW5QiDn6w1lKjq8jZJhNTt3fw\r
+ fZDCDreYQ2cQACrLV2P61UcWWSppeqFOi6ov0NrU2dJqoV8EGOPFsLhpHU/mfSFPV+dU\r
+ GS7ROP5Om85ZGdiH6QfXK++xot/xCO0YM5pnxrqV3w7dVp58YTimTKoCDRT1UMq2zod2\r
+ 2bGw==\r
+X-Gm-Message-State:\r
+ AD7BkJI4MqTj6DdrCNgQT6+2Fhp6tBnDg+SmxaU4g1n0BjtiSE3+IO511xe9PTxLlMN9ng==\r
+X-Received: by 10.194.60.235 with SMTP id k11mr18327611wjr.148.1459697908109; \r
+ Sun, 03 Apr 2016 08:38:28 -0700 (PDT)\r
+Received: from disaster-area.hh.sledj.net\r
+ ([2a01:348:1a2:1:ea39:35ff:fe2c:a227])\r
+ by smtp.gmail.com with ESMTPSA id w203sm9178087wmg.14.2016.04.03.08.38.26\r
+ for <notmuch@notmuchmail.org>\r
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sun, 03 Apr 2016 08:38:27 -0700 (PDT)\r
+Received: from localhost (disaster-area.hh.sledj.net [local])\r
+ by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id eb7ad0f1\r
+ for <notmuch@notmuchmail.org>; Sun, 3 Apr 2016 15:38:23 +0000 (UTC)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/2] Test: Fix tests.\r
+Date: Sun,  3 Apr 2016 16:38:23 +0100\r
+Message-Id: <1459697903-32673-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1459697903-32673-1-git-send-email-dme@dme.org>\r
+References: <1459697903-32673-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: Sun, 03 Apr 2016 15:38:48 -0000\r
+\r
+---\r
+ test/T310-emacs.sh                                                    | 2 ++\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
+ 9 files changed, 25 insertions(+)\r
+\r
+diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+index 43b9973..daa0256 100755\r
+--- a/test/T310-emacs.sh\r
++++ b/test/T310-emacs.sh\r
+@@ -394,6 +394,8 @@ User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Adrian Perez de Castro <aperez@igalia.com> writes:\r
\r
++> [ Unknown signature status ]\r
++>\r
+ > Hello to all,\r
+ >\r
+ > I have just heard about Not Much today in some random Linux-related news\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