6a/2dbd6e7963740f3590570724ce152cabb7c669

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id C02D1431FB6\r
   6         for <notmuch@notmuchmail.org>; Sun, 11 Nov 2012 17:12:23 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id bB6lqtLv5Vt6 for <notmuch@notmuchmail.org>;\r
  16         Sun, 11 Nov 2012 17:12:22 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
  18         [18.7.68.37])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 88E90431FAF\r
  20         for <notmuch@notmuchmail.org>; Sun, 11 Nov 2012 17:12:22 -0800 (PST)\r
  21 X-AuditID: 12074425-b7fcc6d00000091f-e6-50a04cf629ce\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 55.61.02335.6FC40A05; Sun, 11 Nov 2012 20:12:22 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qAC1CEh9020051; \r
  27         Sun, 11 Nov 2012 20:12:14 -0500\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qAC1C8CS025028\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 11 Nov 2012 20:12:10 -0500 (EST)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1TXiZM-0003KB-LE; Sun, 11 Nov 2012 20:12:08 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2] test: Fix HTML rendering test\r
  41 Date: Sun, 11 Nov 2012 20:12:07 -0500\r
  42 Message-Id: <1352682727-12533-1-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10.4\r
  44 X-Brightmail-Tracker:\r
  45  H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsUixCmqrPvNZ0GAQfdMTos7PbtYLK7fnMls\r
  46         8WblPFYHZo+ds+6yexz+upDF49mqW8wBzFFcNimpOZllqUX6dglcGe8//WYt6BCq2LaZr4Hx\r
  47         B18XIweHhICJxKerpl2MnECmmMSFe+vZuhi5OIQE9jFKbD21jRHC2cAoseLUc6jMIyaJL7vm\r
  48         sUA4cxklzq6eyAzSzyagIbFt/3JGEFtEQFpi593ZrCA2s0CixNIzb8DiwgKGEidftLOD2CwC\r
  49         qhItk1eBxXkFHCSO/O1jhbhDUaL72QS2CYy8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFula\r
  50         6OVmluilppRuYgQFC7uL6g7GCYeUDjEKcDAq8fBucFgQIMSaWFZcmXuIUZKDSUmU190bKMSX\r
  51         lJ9SmZFYnBFfVJqTWnyIUYKDWUmEd5oIUI43JbGyKrUoHyYlzcGiJM57I+Wmv5BAemJJanZq\r
  52         akFqEUxWhoNDSYKXDxgVQoJFqempFWmZOSUIaSYOTpDhPEDDP4Is5i0uSMwtzkyHyJ9iVJQS\r
  53         530EkhAASWSU5sH1wqL5FaM40CvCvAtAqniAiQCu+xXQYCagwY1H5oAMLklESEk1MPLX59x7\r
  54         Yx1e+tT78BaDKzPOn9LxVNzsIGXu2vjpeVzwwmNa/HbznxjbvY/on6d5rTrj7Os7KXyvzzes\r
  55         X+O9PunTgvTgDv1M0xVZfSp2b5reeyZu/1ujGPtrVtKVvyK3dYP+vMiVD9Lmt/iw4LDJoqqv\r
  56         C1UOR5f8Xs3m8HJDSfKz7wcuvPR8Ea7EUpyRaKjFXFScCAD9ppQwwQIAAA==\r
  57 Cc: tomi.ollila@iki.fi\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Mon, 12 Nov 2012 01:12:23 -0000\r
  71 \r
  72 The test designed to exercise Emacs' rendering of HTML emails\r
  73 containing images inadvertently assumed w3m was available under Emacs\r
  74 23.  The real point of this test was to check that Emacs 24's shr\r
  75 renderer didn't crash when given img tags, so use shr if it's\r
  76 available, html2text otherwise (which is built in), and do only a\r
  77 simple sanity check of the result.\r
  78 ---\r
  79 \r
  80 This is version 2 of\r
  81 id:"1351109160-11105-1-git-send-email-amdragon@mit.edu".  This makes\r
  82 fewer assumptions about the output, so hopefully it fixes the problems\r
  83 with the first version.\r
  84 \r
  85  test/emacs |   27 ++++++++++-----------------\r
  86  1 file changed, 10 insertions(+), 17 deletions(-)\r
  87 \r
  88 diff --git a/test/emacs b/test/emacs\r
  89 index 1f84b91..64b00db 100755\r
  90 --- a/test/emacs\r
  91 +++ b/test/emacs\r
  92 @@ -750,13 +750,12 @@ counter=$(test_emacs \\r
  93  test_expect_equal "$counter" 2\r
  94  \r
  95  \r
  96 -test_begin_subtest "Rendering HTML mail with images"\r
  97  add_message '[subject]="HTML mail with images"' \\r
  98      '[content-type]="multipart/related; boundary=abcd"' \\r
  99      '[body]="--abcd\r
 100  Content-Type: text/html\r
 101  \r
 102 -<img src="cid:330@goomoji.gmail">\r
 103 +<img src="cid:330@goomoji.gmail"> smiley\r
 104  \r
 105  --abcd\r
 106  Content-Type: image/gif\r
 107 @@ -766,21 +765,15 @@ Content-ID: <330@goomoji.gmail>\r
 108  R0lGODlhDAAMAKIFAF5LAP/zxAAAANyuAP/gaP///wAAAAAAACH5BAEAAAUALAAAAAAMAAwAAAMl\r
 109  WLPcGjDKFYi9lxKBOaGcF35DhWHamZUW0K4mAbiwWtuf0uxFAgA7\r
 110  --abcd--"'\r
 111 -test_emacs "(notmuch-show \"id:${gen_msg_id}\")\r
 112 -           (test-output)"\r
 113 -# Normalize output for Emacs 23 and Emacs 24\r
 114 -sed -i 's/\[cid\]/*/' OUTPUT\r
 115 -cat <<EOF >EXPECTED\r
 116 -Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox)\r
 117 -Subject: HTML mail with images\r
 118 -To: Notmuch Test Suite <test_suite@notmuchmail.org>\r
 119 -Date: Fri, 05 Jan 2001 15:43:57 +0000\r
 120 -\r
 121 -[ multipart/related ]\r
 122 -[ text/html ]\r
 123 -*\r
 124 -EOF\r
 125 -test_expect_equal_file OUTPUT EXPECTED\r
 126 +test_emacs "(let ((mm-text-html-renderer\r
 127 +                  (if (assq 'shr mm-text-html-renderer-alist)\r
 128 +                      'shr 'html2text)))\r
 129 +             (notmuch-show \"id:${gen_msg_id}\"))\r
 130 +           (test-output)" > /dev/null\r
 131 +# Different Emacs versions and renderers give very different results,\r
 132 +# so just check that something reasonable showed up.\r
 133 +test_expect_success "Rendering HTML mail with images" \\r
 134 +    'grep -q smiley OUTPUT'\r
 135  \r
 136  \r
 137  test_done\r
 138 -- \r
 139 1.7.10.4\r
 140 \r