5b/0c79bf077cabf69fbc6268e04bbf99f6e136f2

   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 E6D55431FAF\r
   6         for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 13:06:07 -0700 (PDT)\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 fe6cRdwuRGpf for <notmuch@notmuchmail.org>;\r
  16         Wed, 24 Oct 2012 13:06:07 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 41EA6431FAE\r
  20         for <notmuch@notmuchmail.org>; Wed, 24 Oct 2012 13:06:07 -0700 (PDT)\r
  21 X-AuditID: 1209190c-b7f286d000000ee3-8b-50884a2dcbfd\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 29.A1.03811.D2A48805; Wed, 24 Oct 2012 16:06:05 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q9OK64MY008315; \r
  27         Wed, 24 Oct 2012 16:06:04 -0400\r
  28 Received: from drake.dyndns.org (26-4-181.dynamic.csail.mit.edu [18.26.4.181])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q9OK62uH002456\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Wed, 24 Oct 2012 16:06:03 -0400 (EDT)\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TR7DG-0002tm-0I; Wed, 24 Oct 2012 16:06:02 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH] test: Fix HTML rendering test\r
  40 Date: Wed, 24 Oct 2012 16:06:00 -0400\r
  41 Message-Id: <1351109160-11105-1-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10\r
  43 X-Brightmail-Tracker:\r
  44  H4sIAAAAAAAAA+NgFprJIsWRmVeSWpSXmKPExsUixCmqravr1RFgMHWdtcX1mzOZHRg9nq26\r
  45         xRzAGMVlk5Kak1mWWqRvl8CVcXD1C5aC3TwVXxe5NDDO4epi5OCQEDCReD1VtouRE8gUk7hw\r
  46         bz1bFyMXh5DAPkaJ/StuMkM4GxglNnb/hcqcYpK4veIVK4Qzl1Fi+YWJ7CD9bAIaEtv2L2cE\r
  47         sUUEpCV23p3NCrKCWUBN4k+XCkhYWEBP4vXW+0wgNouAqsSr5x/BynkFHCQ2f/zEDHGGvMTT\r
  48         +31sExh5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFLTSndxAgOAUmeHYxvDiod\r
  49         YhTgYFTi4T3g0REgxJpYVlyZe4hRkoNJSZR3gy1QiC8pP6UyI7E4I76oNCe1+BCjBAezkgjv\r
  50         5AftAUK8KYmVValF+TApaQ4WJXHeyyk3/YUE0hNLUrNTUwtSi2CyMhwcShK8Np5AQwWLUtNT\r
  51         K9Iyc0oQ0kwcnCDDeYCGq4HU8BYXJOYWZ6ZD5E8xKkqJ8zq7AyUEQBIZpXlwvbAYfcUoDvSK\r
  52         MG8YSDsPML7hul8BDWYCGmzO0woyuCQRISXVwFj+UmQf73pFW+OA1fvP71qzP4XLMaaDye9H\r
  53         2i+tJ5tnP3C8HfXw7qs1C+LUrGR/WZ0xsRDa+Hju4vdX9nzyrlI9dPUwr5wOO1+czeaJIgIH\r
  54         dfpZBDIWnTrl315r1svTs9f6R+2bWPEJE303KttES131Xn9lzvFrk1vFZL48kIy6n/tj9f+c\r
  55         vhNKLMUZiYZazEXFiQBGg4M0rAIAAA==\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Wed, 24 Oct 2012 20:06:08 -0000\r
  69 \r
  70 The test designed to exercise Emacs' rendering of HTML emails\r
  71 containing images inadvertently assumed w3m was available under Emacs\r
  72 23.  The real point of this test was to exercise Emacs 24's shr\r
  73 renderer, so if shr isn't available, we now fall back to html2text,\r
  74 which comes with Emacs.\r
  75 ---\r
  76  test/emacs |   11 +++++++----\r
  77  1 file changed, 7 insertions(+), 4 deletions(-)\r
  78 \r
  79 diff --git a/test/emacs b/test/emacs\r
  80 index 1f84b91..2ef78bf 100755\r
  81 --- a/test/emacs\r
  82 +++ b/test/emacs\r
  83 @@ -756,7 +756,7 @@ add_message '[subject]="HTML mail with images"' \\r
  84      '[body]="--abcd\r
  85  Content-Type: text/html\r
  86  \r
  87 -<img src="cid:330@goomoji.gmail">\r
  88 +<img src="cid:330@goomoji.gmail"> smiley\r
  89  \r
  90  --abcd\r
  91  Content-Type: image/gif\r
  92 @@ -766,10 +766,13 @@ Content-ID: <330@goomoji.gmail>\r
  93  R0lGODlhDAAMAKIFAF5LAP/zxAAAANyuAP/gaP///wAAAAAAACH5BAEAAAUALAAAAAAMAAwAAAMl\r
  94  WLPcGjDKFYi9lxKBOaGcF35DhWHamZUW0K4mAbiwWtuf0uxFAgA7\r
  95  --abcd--"'\r
  96 -test_emacs "(notmuch-show \"id:${gen_msg_id}\")\r
  97 +test_emacs "(let ((mm-text-html-renderer\r
  98 +                  (if (assq 'shr mm-text-html-renderer-alist)\r
  99 +                      'shr 'html2text)))\r
 100 +             (notmuch-show \"id:${gen_msg_id}\"))\r
 101             (test-output)"\r
 102  # Normalize output for Emacs 23 and Emacs 24\r
 103 -sed -i 's/\[cid\]/*/' OUTPUT\r
 104 +sed -i 's/^ smiley/* smiley/' OUTPUT\r
 105  cat <<EOF >EXPECTED\r
 106  Notmuch Test Suite <test_suite@notmuchmail.org> (2001-01-05) (inbox)\r
 107  Subject: HTML mail with images\r
 108 @@ -778,7 +781,7 @@ Date: Fri, 05 Jan 2001 15:43:57 +0000\r
 109  \r
 110  [ multipart/related ]\r
 111  [ text/html ]\r
 112 -*\r
 113 +* smiley\r
 114  EOF\r
 115  test_expect_equal_file OUTPUT EXPECTED\r
 116  \r
 117 -- \r
 118 1.7.10\r
 119 \r