Return-Path: <bremner@tesseract.cs.unb.ca>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id A8250431FBC
	for <notmuch@notmuchmail.org>; Fri, 19 Sep 2014 22:42:16 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Level: 
X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
	autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id Hf-U+xx75fuQ for <notmuch@notmuchmail.org>;
	Fri, 19 Sep 2014 22:42:11 -0700 (PDT)
Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 368FD431FAE
	for <notmuch@notmuchmail.org>; Fri, 19 Sep 2014 22:42:11 -0700 (PDT)
Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
	(envelope-from <bremner@tesseract.cs.unb.ca>)
	id 1XVDQv-00013A-3s; Sat, 20 Sep 2014 02:42:09 -0300
Received: (nullmailer pid 21988 invoked by uid 1000); Sat, 20 Sep 2014
	05:42:03 -0000
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH] test/emacs: globally force the html renderer to html2text
Date: Sat, 20 Sep 2014 07:41:35 +0200
Message-Id: <1411191695-21933-1-git-send-email-david@tethera.net>
X-Mailer: git-send-email 2.1.0
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Sep 2014 05:42:16 -0000

Previously we did this for a single test, but some other proposed
tests ( id:1398105468-14317-3-git-send-email-amdragon@mit.edu ) show
similar breakage when switching renderers.
---
 test/T310-emacs.sh | 2 +-
 test/test-lib.el   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index ac966e5..c302402 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -483,7 +483,7 @@ test_expect_equal_file OUTPUT EXPECTED
 test_begin_subtest "Reply within emacs to an html-only message"
 add_message '[content-type]="text/html"' \
 	    '[body]="Hi,<br />This is an <b>HTML</b> test message.<br /><br />OK?"'
-test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text))
+test_emacs "(let ((message-hidden-headers '()))
 	    (notmuch-show \"id:${gen_msg_id}\")
 	    (notmuch-show-reply)
 	    (test-output))"
diff --git a/test/test-lib.el b/test/test-lib.el
index 36afe63..bbc03cb 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -181,3 +181,8 @@ nothing."
 ;; suite
 (setq notmuch-tag-deleted-formats
       '((".*" nil)))
+
+;; force a common html renderer, to avoid test variations between
+;; environments
+
+(setq mm-text-html-renderer 'html2text)
-- 
2.1.0