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