From: David Edmondson Date: Sun, 3 Apr 2016 15:38:23 +0000 (+0100) Subject: [PATCH v2 2/2] Test: Fix tests. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60c2a42dfe9834ea30ea521a93c07884c6a9c12e;p=notmuch-archives.git [PATCH v2 2/2] Test: Fix tests. --- diff --git a/96/48f6d55adba82e74aecc3a8ecc931d05d2e709 b/96/48f6d55adba82e74aecc3a8ecc931d05d2e709 new file mode 100644 index 000000000..72e48b862 --- /dev/null +++ b/96/48f6d55adba82e74aecc3a8ecc931d05d2e709 @@ -0,0 +1,325 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 3EDAE6DE034D + for ; Sun, 3 Apr 2016 08:38:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.161 +X-Spam-Level: +X-Spam-Status: No, score=-0.161 tagged_above=-999 required=5 + tests=[AWL=-0.094, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, + RCVD_IN_MSPIKE_WL=-0.01, SPF_NEUTRAL=0.652, UNPARSEABLE_RELAY=0.001] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id e7pbEBciqePV for ; + Sun, 3 Apr 2016 08:38:39 -0700 (PDT) +Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com + [209.85.215.65]) + by arlo.cworth.org (Postfix) with ESMTPS id B5D426DE0159 + for ; Sun, 3 Apr 2016 08:38:30 -0700 (PDT) +Received: by mail-lf0-f65.google.com with SMTP id p81so13437467lfb.3 + for ; Sun, 03 Apr 2016 08:38:30 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=dme-org.20150623.gappssmtp.com; s=20150623; + h=from:to:subject:date:message-id:in-reply-to:references; + bh=FnnStD7OAyey4J4FqC35pVSGVTULOeXaXehkuqy7Zac=; + b=GaoMQlqRL6EVn3s3SRbkUUSRkbCKgla9nmiM/ITZO2FEk7KyrZMqYdXO53MBu9zHM2 + qMSBJVpCWZEr9sHm5UkmxUCdNN1smtuyBJFdCuF4lLkqJO0S2iCSyrTDJ/RxOGdDDHzY + cjyuWre/OtFDY0/G79Skt0pUMxGf1/YgZfNizdUHCPFWKL0sHyXaHZCjV70rtXVqFm9J + Kx1001PJiv/yk756HTZL/DyrTaDrsPVK3DJXmFbhnVtUP6yYX05lK7De9lDeUZmBwAOu + qkksDk4uy2263mcNBnulLNJTV+YhDEex1Qu6CLYoEVr2vO+1gzKBHw6nYJ+r8iKkHsvc + cOHA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to + :references; + bh=FnnStD7OAyey4J4FqC35pVSGVTULOeXaXehkuqy7Zac=; + b=MxemZORW8aQDI2xzAKxQ8DYlxCiocRSot/ZgXGNhGCl+nL1AAze69Qp9DUNSNCqHq0 + QkjApzKLwYOljeA/2npW6ooECFm4KuEkuG0G609ACGKoi5n7KPO071F6Oz2nn5aCrV2f + 4mOPlI+LLCvMybJ7Kq2MvlQApdy8Vnidwjqvz0Yu9awcW5QiDn6w1lKjq8jZJhNTt3fw + fZDCDreYQ2cQACrLV2P61UcWWSppeqFOi6ov0NrU2dJqoV8EGOPFsLhpHU/mfSFPV+dU + GS7ROP5Om85ZGdiH6QfXK++xot/xCO0YM5pnxrqV3w7dVp58YTimTKoCDRT1UMq2zod2 + 2bGw== +X-Gm-Message-State: + AD7BkJI4MqTj6DdrCNgQT6+2Fhp6tBnDg+SmxaU4g1n0BjtiSE3+IO511xe9PTxLlMN9ng== +X-Received: by 10.194.60.235 with SMTP id k11mr18327611wjr.148.1459697908109; + Sun, 03 Apr 2016 08:38:28 -0700 (PDT) +Received: from disaster-area.hh.sledj.net + ([2a01:348:1a2:1:ea39:35ff:fe2c:a227]) + by smtp.gmail.com with ESMTPSA id w203sm9178087wmg.14.2016.04.03.08.38.26 + for + (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Sun, 03 Apr 2016 08:38:27 -0700 (PDT) +Received: from localhost (disaster-area.hh.sledj.net [local]) + by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id eb7ad0f1 + for ; Sun, 3 Apr 2016 15:38:23 +0000 (UTC) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v2 2/2] Test: Fix tests. +Date: Sun, 3 Apr 2016 16:38:23 +0100 +Message-Id: <1459697903-32673-3-git-send-email-dme@dme.org> +X-Mailer: git-send-email 2.1.4 +In-Reply-To: <1459697903-32673-1-git-send-email-dme@dme.org> +References: <1459697903-32673-1-git-send-email-dme@dme.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 03 Apr 2016 15:38:48 -0000 + +--- + test/T310-emacs.sh | 2 ++ + .../notmuch-show-elide-non-matching-messages-off | 3 +++ + .../notmuch-show-elide-non-matching-messages-on | 3 +++ + .../emacs-show.expected-output/notmuch-show-indent-thread-content-off | 3 +++ + .../notmuch-show-process-crypto-mime-parts-off | 1 + + test/emacs.expected-output/notmuch-show-thread-maildir-storage | 4 ++++ + .../notmuch-show-thread-maildir-storage-with-fourfold-indentation | 4 ++++ + .../notmuch-show-thread-maildir-storage-without-indentation | 4 ++++ + test/tree.expected-output/notmuch-tree-show-window | 1 + + 9 files changed, 25 insertions(+) + +diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh +index 43b9973..daa0256 100755 +--- a/test/T310-emacs.sh ++++ b/test/T310-emacs.sh +@@ -394,6 +394,8 @@ User-Agent: Notmuch/XXX Emacs/XXX + --text follows this line-- + Adrian Perez de Castro writes: + ++> [ Unknown signature status ] ++> + > Hello to all, + > + > I have just heard about Not Much today in some random Linux-related news +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 +index b31fe62..9f1e91f 100644 +--- 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 +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +@@ -39,6 +40,7 @@ Cheers, + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +@@ -65,6 +67,7 @@ Cheers, + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my + > private notmuch repository +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 +index bafb479..118053b 100644 +--- 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 +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +@@ -38,6 +39,7 @@ Cheers, + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +@@ -62,6 +64,7 @@ Cheers, + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my + > private notmuch repository +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 +index 37b4f7d..2cb1211 100644 +--- a/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off ++++ b/test/emacs-show.expected-output/notmuch-show-indent-thread-content-off +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +@@ -39,6 +40,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +@@ -65,6 +67,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my + > private notmuch repository +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 +index 3282c7b..ce2892a 100644 +--- 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 +@@ -9,6 +9,7 @@ Subject: [notmuch] Working with Maildir storage? + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +diff --git a/test/emacs.expected-output/notmuch-show-thread-maildir-storage b/test/emacs.expected-output/notmuch-show-thread-maildir-storage +index cdbfa1d..3599892 100644 +--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage ++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +@@ -45,6 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + + Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did +@@ -77,6 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +@@ -159,6 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my + > private notmuch repository +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 +index b0bf93e..4721b8b 100644 +--- 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 +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +@@ -45,6 +46,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + + Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did +@@ -77,6 +79,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +@@ -159,6 +162,7 @@ http://notmuchmail.org/mailman/listinfo/notmuch + + [ multipart/mixed ] + [ multipart/signed ] ++ [ Unknown signature status ] + [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my + > private notmuch repository +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 +index 08de8b5..62a4635 100644 +--- a/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation ++++ b/test/emacs.expected-output/notmuch-show-thread-maildir-storage-without-indentation +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +@@ -45,6 +46,7 @@ Date: Wed, 18 Nov 2009 01:02:38 +0600 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + + Twas brillig at 14:00:54 17.11.2009 UTC-05 when lars@seas.harvard.edu did +@@ -77,6 +79,7 @@ Date: Tue, 17 Nov 2009 15:33:01 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + > See the patch just posted here. + +@@ -159,6 +162,7 @@ Date: Tue, 17 Nov 2009 19:50:40 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + > I've also pushed a slightly more complicated (and complete) fix to my + > private notmuch repository +diff --git a/test/tree.expected-output/notmuch-tree-show-window b/test/tree.expected-output/notmuch-tree-show-window +index e16792b..ab7205b 100644 +--- a/test/tree.expected-output/notmuch-tree-show-window ++++ b/test/tree.expected-output/notmuch-tree-show-window +@@ -5,6 +5,7 @@ Date: Tue, 17 Nov 2009 14:00:54 -0500 + + [ multipart/mixed ] + [ multipart/signed ] ++[ Unknown signature status ] + [ text/plain ] + I saw the LWN article and decided to take a look at notmuch. I'm + currently using mutt and mairix to index and read a collection of +-- +2.1.4 +