test/emacs: globally force the html renderer to html2text

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.

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index ac966e525a04af8f88daabf618cf7af9ef08afd5..c302402185668503d3d096ca9499d3b96d86b3f5 100755 (executable)
--- 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 36afe630e5edb35d0a007bcb3be6a2131d9e8d20..bbc03cba957d18fc7e3eb0e71ce93e513f889f54 100644 (file)
--- 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)