[PATCH] test: Fix HTML rendering test

diff --git a/5b/0c79bf077cabf69fbc6268e04bbf99f6e136f2 b/5b/0c79bf077cabf69fbc6268e04bbf99f6e136f2
new file mode 100644 (file)
index 0000000..bf45b10
--- /dev/null
+++ b/5b/0c79bf077cabf69fbc6268e04bbf99f6e136f2
@@ -0,0 +1,119 @@
+Return-Path: <amdragon@mit.edu>\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 E6D55431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 13:06:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 fe6cRdwuRGpf for <notmuch@notmuchmail.org>;\r
+       Wed, 24 Oct 2012 13:06:07 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+       [18.9.25.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 41EA6431FAE\r
+       for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 13:06:07 -0700 (PDT)\r
+X-AuditID: 1209190c-b7f286d000000ee3-8b-50884a2dcbfd\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 29.A1.03811.D2A48805; Wed, 24 Oct 2012 16:06:05 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q9OK64MY008315; \r
+       Wed, 24 Oct 2012 16:06:04 -0400\r
+Received: from drake.dyndns.org (26-4-181.dynamic.csail.mit.edu [18.26.4.181])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q9OK62uH002456\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Wed, 24 Oct 2012 16:06:03 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TR7DG-0002tm-0I; Wed, 24 Oct 2012 16:06:02 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test: Fix HTML rendering test\r
+Date: Wed, 24 Oct 2012 16:06:00 -0400\r
+Message-Id: <1351109160-11105-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsUixCmqravr1RFgMHWdtcX1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CVcXD1C5aC3TwVXxe5NDDO4epi5OCQEDCReD1VtouRE8gUk7hw\r
+       bz1bFyMXh5DAPkaJ/StuMkM4GxglNnb/hcqcYpK4veIVK4Qzl1Fi+YWJ7CD9bAIaEtv2L2cE\r
+       sUUEpCV23p3NCrKCWUBN4k+XCkhYWEBP4vXW+0wgNouAqsSr5x/BynkFHCQ2f/zEDHGGvMTT\r
+       +31sExh5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFLTSndxAgOAUmeHYxvDiod\r
+       YhTgYFTi4T3g0REgxJpYVlyZe4hRkoNJSZR3gy1QiC8pP6UyI7E4I76oNCe1+BCjBAezkgjv\r
+       5AftAUK8KYmVValF+TApaQ4WJXHeyyk3/YUE0hNLUrNTUwtSi2CyMhwcShK8Np5AQwWLUtNT\r
+       K9Iyc0oQ0kwcnCDDeYCGq4HU8BYXJOYWZ6ZD5E8xKkqJ8zq7AyUEQBIZpXlwvbAYfcUoDvSK\r
+       MG8YSDsPML7hul8BDWYCGmzO0woyuCQRISXVwFj+UmQf73pFW+OA1fvP71qzP4XLMaaDye9H\r
+       2i+tJ5tnP3C8HfXw7qs1C+LUrGR/WZ0xsRDa+Hju4vdX9nzyrlI9dPUwr5wOO1+czeaJIgIH\r
+       dfpZBDIWnTrl315r1svTs9f6R+2bWPEJE303KttES131Xn9lzvFrk1vFZL48kIy6n/tj9f+c\r
+       vhNKLMUZiYZazEXFiQBGg4M0rAIAAA==\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: Wed, 24 Oct 2012 20:06:08 -0000\r
+\r
+The test designed to exercise Emacs' rendering of HTML emails\r
+containing images inadvertently assumed w3m was available under Emacs\r
+23.  The real point of this test was to exercise Emacs 24's shr\r
+renderer, so if shr isn't available, we now fall back to html2text,\r
+which comes with Emacs.\r
+---\r
+ test/emacs |   11 +++++++----\r
+ 1 file changed, 7 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 1f84b91..2ef78bf 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -756,7 +756,7 @@ add_message '[subject]="HTML mail with images"' \\r
+     '[body]="--abcd\r
+ Content-Type: text/html\r
+ \r
+-<img src="cid:330@goomoji.gmail">\r
++<img src="cid:330@goomoji.gmail"> smiley\r
+ \r
+ --abcd\r
+ Content-Type: image/gif\r
+@@ -766,10 +766,13 @@ Content-ID: <330@goomoji.gmail>\r
+ R0lGODlhDAAMAKIFAF5LAP/zxAAAANyuAP/gaP///wAAAAAAACH5BAEAAAUALAAAAAAMAAwAAAMl\r
+ WLPcGjDKFYi9lxKBOaGcF35DhWHamZUW0K4mAbiwWtuf0uxFAgA7\r
+ --abcd--"'\r
+-test_emacs "(notmuch-show \"id:${gen_msg_id}\")\r
++test_emacs "(let ((mm-text-html-renderer\r
++                 (if (assq 'shr mm-text-html-renderer-alist)\r
++                     'shr 'html2text)))\r
++            (notmuch-show \"id:${gen_msg_id}\"))\r
+           (test-output)"\r
+ # Normalize output for Emacs 23 and Emacs 24\r
+-sed -i 's/\[cid\]/*/' OUTPUT\r
++sed -i 's/^ smiley/* smiley/' OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox)\r
+ Subject: HTML mail with images\r
+@@ -778,7 +781,7 @@ Date: Fri, 05 Jan 2001 15:43:57 +0000\r
+ \r
+ [ multipart/related ]\r
+ [ text/html ]\r
+-*\r
++* smiley\r
+ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+-- \r
+1.7.10\r
+\r