[PATCH] test/emacs: globally force the html renderer to html2text

diff --git a/8f/0e4f38dc9d1328c6595ed7bbdd106cc3a5f6f9 b/8f/0e4f38dc9d1328c6595ed7bbdd106cc3a5f6f9
new file mode 100644 (file)
index 0000000..4563abd
--- /dev/null
+++ b/8f/0e4f38dc9d1328c6595ed7bbdd106cc3a5f6f9
@@ -0,0 +1,83 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 A8250431FBC\r
+       for <notmuch@notmuchmail.org>; Fri, 19 Sep 2014 22:42:16 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 Hf-U+xx75fuQ for <notmuch@notmuchmail.org>;\r
+       Fri, 19 Sep 2014 22:42:11 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 368FD431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 19 Sep 2014 22:42:11 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1XVDQv-00013A-3s; Sat, 20 Sep 2014 02:42:09 -0300\r
+Received: (nullmailer pid 21988 invoked by uid 1000); Sat, 20 Sep 2014\r
+       05:42:03 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test/emacs: globally force the html renderer to html2text\r
+Date: Sat, 20 Sep 2014 07:41:35 +0200\r
+Message-Id: <1411191695-21933-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.0\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: Sat, 20 Sep 2014 05:42:16 -0000\r
+\r
+Previously we did this for a single test, but some other proposed\r
+tests ( id:1398105468-14317-3-git-send-email-amdragon@mit.edu ) show\r
+similar breakage when switching renderers.\r
+---\r
+ test/T310-emacs.sh | 2 +-\r
+ test/test-lib.el   | 5 +++++\r
+ 2 files changed, 6 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+index ac966e5..c302402 100755\r
+--- a/test/T310-emacs.sh\r
++++ b/test/T310-emacs.sh\r
+@@ -483,7 +483,7 @@ test_expect_equal_file OUTPUT EXPECTED\r
+ test_begin_subtest "Reply within emacs to an html-only message"\r
+ add_message '[content-type]="text/html"' \\r
+           '[body]="Hi,<br />This is an <b>HTML</b> test message.<br /><br />OK?"'\r
+-test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text))\r
++test_emacs "(let ((message-hidden-headers '()))\r
+           (notmuch-show \"id:${gen_msg_id}\")\r
+           (notmuch-show-reply)\r
+           (test-output))"\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 36afe63..bbc03cb 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -181,3 +181,8 @@ nothing."\r
+ ;; suite\r
+ (setq notmuch-tag-deleted-formats\r
+       '((".*" nil)))\r
++\r
++;; force a common html renderer, to avoid test variations between\r
++;; environments\r
++\r
++(setq mm-text-html-renderer 'html2text)\r
+-- \r
+2.1.0\r
+\r