[PATCH] test: Force reply to use html2text for consistency

diff --git a/f7/141b8e609cc1d911fdc3de9e393f33a696c403 b/f7/141b8e609cc1d911fdc3de9e393f33a696c403
new file mode 100644 (file)
index 0000000..f624ccf
--- /dev/null
+++ b/f7/141b8e609cc1d911fdc3de9e393f33a696c403
@@ -0,0 +1,97 @@
+Return-Path: <awg@lagos.xvx.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 954CA431FC4\r
+       for <notmuch@notmuchmail.org>; Sun,  6 May 2012 07:56:21 -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\r
+       tests=[RCVD_IN_DNSWL_NONE=-0.0001] 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 tIRj2YZuSCtY for <notmuch@notmuchmail.org>;\r
+       Sun,  6 May 2012 07:56:20 -0700 (PDT)\r
+Received: from idcmail-mo1so.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1C0D4431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  6 May 2012 07:56:20 -0700 (PDT)\r
+Received: from pd4ml1so-ssvc.prod.shaw.ca ([10.0.141.141])\r
+       by pd3mo1so-svcs.prod.shaw.ca with ESMTP; 06 May 2012 08:56:18 -0600\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=zu4PKjlF+9DoPrG/TPTQ4CC8dREy1gI1uGhqrRhVwqE=\r
+       c=1 sm=1\r
+       a=TxcI2jV9fO4A:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+       a=7343-z1_AAAA:8 a=lQhQFHXEo_1BE4efVEQA:9 a=0c-eHkXYtrgA:10\r
+       a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+       by pd4ml1so-dmz.prod.shaw.ca with ESMTP; 06 May 2012 08:56:18 -0600\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+       id C711B8004215; Sun,  6 May 2012 08:56:17 -0600 (MDT)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: Force reply to use html2text for consistency\r
+Date: Sun,  6 May 2012 08:56:15 -0600\r
+Message-Id: <1336316175-17852-1-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To:\r
+ <CAMoJFUv6WcFKZVobqLk8tbmZ2GiXHh-fMhhukChBtXVK3brSxQ@mail.gmail.com>\r
+References:\r
+ <CAMoJFUv6WcFKZVobqLk8tbmZ2GiXHh-fMhhukChBtXVK3brSxQ@mail.gmail.com>\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: Sun, 06 May 2012 14:56:21 -0000\r
+\r
+The output of the HTML reply test in the emacs suite can vary\r
+depending on which HTML renderers are installed on the machine running\r
+the tests. The renderer that is always available is emacs's builtin\r
+html2text function. In order to get consistency, force the test to use\r
+html2text even if other renderers are available.\r
+---\r
+\r
+As discussed on IRC, here's a patch that forces the HTML reply test to use\r
+html2text, and adjusts the output accordingly. This should fix the test\r
+failure on the buildbot.\r
+\r
+ test/emacs |    7 ++-----\r
+ 1 files changed, 2 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index a615b39..e9f954c 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -447,7 +447,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 '()))\r
++test_emacs "(let ((message-hidden-headers '()) (mm-text-html-renderer 'html2text))\r
+           (notmuch-show \"id:${gen_msg_id}\")\r
+           (notmuch-show-reply)\r
+           (test-output))"\r
+@@ -463,10 +463,7 @@ User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> writes:\r
+ \r
+-> Hi,\r
+-> This is an HTML test message.\r
+->\r
+-> OK?\r
++> Hi,This is an HTML test message.OK?\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-- \r
+1.7.5.4\r
+\r