[PATCH v2] test: Fix HTML rendering test

diff --git a/6a/2dbd6e7963740f3590570724ce152cabb7c669 b/6a/2dbd6e7963740f3590570724ce152cabb7c669
new file mode 100644 (file)
index 0000000..234ec72
--- /dev/null
+++ b/6a/2dbd6e7963740f3590570724ce152cabb7c669
@@ -0,0 +1,140 @@
+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 C02D1431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Nov 2012 17:12:23 -0800 (PST)\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 bB6lqtLv5Vt6 for <notmuch@notmuchmail.org>;\r
+       Sun, 11 Nov 2012 17:12:22 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 88E90431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 11 Nov 2012 17:12:22 -0800 (PST)\r
+X-AuditID: 12074425-b7fcc6d00000091f-e6-50a04cf629ce\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 55.61.02335.6FC40A05; Sun, 11 Nov 2012 20:12:22 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qAC1CEh9020051; \r
+       Sun, 11 Nov 2012 20:12:14 -0500\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (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 qAC1C8CS025028\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 11 Nov 2012 20:12:10 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TXiZM-0003KB-LE; Sun, 11 Nov 2012 20:12:08 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] test: Fix HTML rendering test\r
+Date: Sun, 11 Nov 2012 20:12:07 -0500\r
+Message-Id: <1352682727-12533-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsUixCmqrPvNZ0GAQfdMTos7PbtYLK7fnMls\r
+       8WblPFYHZo+ds+6yexz+upDF49mqW8wBzFFcNimpOZllqUX6dglcGe8//WYt6BCq2LaZr4Hx\r
+       B18XIweHhICJxKerpl2MnECmmMSFe+vZuhi5OIQE9jFKbD21jRHC2cAoseLUc6jMIyaJL7vm\r
+       sUA4cxklzq6eyAzSzyagIbFt/3JGEFtEQFpi593ZrCA2s0CixNIzb8DiwgKGEidftLOD2CwC\r
+       qhItk1eBxXkFHCSO/O1jhbhDUaL72QS2CYy8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFula\r
+       6OVmluilppRuYgQFC7uL6g7GCYeUDjEKcDAq8fBucFgQIMSaWFZcmXuIUZKDSUmU190bKMSX\r
+       lJ9SmZFYnBFfVJqTWnyIUYKDWUmEd5oIUI43JbGyKrUoHyYlzcGiJM57I+Wmv5BAemJJanZq\r
+       akFqEUxWhoNDSYKXDxgVQoJFqempFWmZOSUIaSYOTpDhPEDDP4Is5i0uSMwtzkyHyJ9iVJQS\r
+       530EkhAASWSU5sH1wqL5FaM40CvCvAtAqniAiQCu+xXQYCagwY1H5oAMLklESEk1MPLX59x7\r
+       Yx1e+tT78BaDKzPOn9LxVNzsIGXu2vjpeVzwwmNa/HbznxjbvY/on6d5rTrj7Os7KXyvzzes\r
+       X+O9PunTgvTgDv1M0xVZfSp2b5reeyZu/1ujGPtrVtKVvyK3dYP+vMiVD9Lmt/iw4LDJoqqv\r
+       C1UOR5f8Xs3m8HJDSfKz7wcuvPR8Ea7EUpyRaKjFXFScCAD9ppQwwQIAAA==\r
+Cc: tomi.ollila@iki.fi\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: Mon, 12 Nov 2012 01:12:23 -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 check that Emacs 24's shr\r
+renderer didn't crash when given img tags, so use shr if it's\r
+available, html2text otherwise (which is built in), and do only a\r
+simple sanity check of the result.\r
+---\r
+\r
+This is version 2 of\r
+id:"1351109160-11105-1-git-send-email-amdragon@mit.edu".  This makes\r
+fewer assumptions about the output, so hopefully it fixes the problems\r
+with the first version.\r
+\r
+ test/emacs |   27 ++++++++++-----------------\r
+ 1 file changed, 10 insertions(+), 17 deletions(-)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 1f84b91..64b00db 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -750,13 +750,12 @@ counter=$(test_emacs \\r
+ test_expect_equal "$counter" 2\r
+ \r
+ \r
+-test_begin_subtest "Rendering HTML mail with images"\r
+ add_message '[subject]="HTML mail with images"' \\r
+     '[content-type]="multipart/related; boundary=abcd"' \\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,21 +765,15 @@ 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-output)"\r
+-# Normalize output for Emacs 23 and Emacs 24\r
+-sed -i 's/\[cid\]/*/' OUTPUT\r
+-cat <<EOF >EXPECTED\r
+-Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox)\r
+-Subject: HTML mail with images\r
+-To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+-Date: Fri, 05 Jan 2001 15:43:57 +0000\r
+-\r
+-[ multipart/related ]\r
+-[ text/html ]\r
+-*\r
+-EOF\r
+-test_expect_equal_file OUTPUT EXPECTED\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)" > /dev/null\r
++# Different Emacs versions and renderers give very different results,\r
++# so just check that something reasonable showed up.\r
++test_expect_success "Rendering HTML mail with images" \\r
++    'grep -q smiley OUTPUT'\r
+ \r
+ \r
+ test_done\r
+-- \r
+1.7.10.4\r
+\r