Return-Path: <awg@lagos.xvx.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 954CA431FC4
	for <notmuch@notmuchmail.org>; Sun,  6 May 2012 07:56:21 -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=[RCVD_IN_DNSWL_NONE=-0.0001] 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 tIRj2YZuSCtY for <notmuch@notmuchmail.org>;
	Sun,  6 May 2012 07:56:20 -0700 (PDT)
Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10])
	by olra.theworths.org (Postfix) with ESMTP id 1C0D4431FAE
	for <notmuch@notmuchmail.org>; Sun,  6 May 2012 07:56:20 -0700 (PDT)
Received: from pd4ml1so-ssvc.prod.shaw.ca ([10.0.141.141])
	by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 06 May 2012 08:56:18 -0600
X-Cloudmark-SP-Filtered: true
X-Cloudmark-SP-Result: v=1.1 cv=zu4PKjlF+9DoPrG/TPTQ4CC8dREy1gI1uGhqrRhVwqE=
	c=1 sm=1
	a=TxcI2jV9fO4A:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17
	a=7343-z1_AAAA:8 a=lQhQFHXEo_1BE4efVEQA:9 a=0c-eHkXYtrgA:10
	a=HpAAvcLHHh0Zw7uRqdWCyQ==:117
Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])
	by pd4ml1so-dmz.prod.shaw.ca with ESMTP; 06 May 2012 08:56:18 -0600
Received: by lagos.xvx.ca (Postfix, from userid 1000)
	id C711B8004215; Sun,  6 May 2012 08:56:17 -0600 (MDT)
From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>
To: notmuch@notmuchmail.org
Subject: [PATCH] test: Force reply to use html2text for consistency
Date: Sun,  6 May 2012 08:56:15 -0600
Message-Id: <1336316175-17852-1-git-send-email-awg+notmuch@xvx.ca>
X-Mailer: git-send-email 1.7.5.4
In-Reply-To:
 <CAMoJFUv6WcFKZVobqLk8tbmZ2GiXHh-fMhhukChBtXVK3brSxQ@mail.gmail.com>
References:
 <CAMoJFUv6WcFKZVobqLk8tbmZ2GiXHh-fMhhukChBtXVK3brSxQ@mail.gmail.com>
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: Sun, 06 May 2012 14:56:21 -0000

The output of the HTML reply test in the emacs suite can vary
depending on which HTML renderers are installed on the machine running
the tests. The renderer that is always available is emacs's builtin
html2text function. In order to get consistency, force the test to use
html2text even if other renderers are available.
---

As discussed on IRC, here's a patch that forces the HTML reply test to use
html2text, and adjusts the output accordingly. This should fix the test
failure on the buildbot.

 test/emacs |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/test/emacs b/test/emacs
index a615b39..e9f954c 100755
--- a/test/emacs
+++ b/test/emacs
@@ -447,7 +447,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 '()))
+test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text))
 	    (notmuch-show \"id:${gen_msg_id}\")
 	    (notmuch-show-reply)
 	    (test-output))"
@@ -463,10 +463,7 @@ User-Agent: Notmuch/XXX Emacs/XXX
 --text follows this line--
 Notmuch Test Suite <test_suite@notmuchmail.org> writes:
 
-> Hi,
-> This is an HTML test message.
->
-> OK?
+> Hi,This is an HTML test message.OK?
 EOF
 test_expect_equal_file OUTPUT EXPECTED
 
-- 
1.7.5.4