[PATCH 2/3] test: Add a test for HTML email with inline images

diff --git a/8a/a2372685bb273ab23da97d60b64468d222df60 b/8a/a2372685bb273ab23da97d60b64468d222df60
new file mode 100644 (file)
index 0000000..15db7de
--- /dev/null
+++ b/8a/a2372685bb273ab23da97d60b64468d222df60
@@ -0,0 +1,124 @@
+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 8F76C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 29 Sep 2012 10:55:22 -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 QUB9mww7ilUL for <notmuch@notmuchmail.org>;\r
+       Sat, 29 Sep 2012 10:55:21 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id B696B431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 29 Sep 2012 10:55:21 -0700 (PDT)\r
+X-AuditID: 1209190d-b7f906d0000008de-91-506736096a61\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id BE.E1.02270.90637605; Sat, 29 Sep 2012 13:55:21 -0400 (EDT)\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 q8THtK09018533; \r
+       Sat, 29 Sep 2012 13:55:20 -0400\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 q8THtJRK004647\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 29 Sep 2012 13:55:20 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TI1G2-0003Eo-VT; Sat, 29 Sep 2012 13:55:18 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3] test: Add a test for HTML email with inline images\r
+Date: Sat, 29 Sep 2012 13:55:13 -0400\r
+Message-Id: <1348941314-8377-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1348941314-8377-1-git-send-email-amdragon@mit.edu>\r
+References: <1348941314-8377-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrMtplh5gcPapoMX1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CVcaVjD2vBL66Kr1vfMTcwzuPsYuTkkBAwkXj/9RobhC0mceHe\r
+       eiCbi0NIYB+jxJOO7YwQzgZGiTWzD0E5j5gkzm3fBFU2l1FievcLsH42AQ2JbfuXM4LYIgLS\r
+       EjvvzmbtYuTgYBZQk/jTpQISFhZwl/i29w0LiM0ioCrx6dYJdpASXgF7iT33pCGukJd4er8P\r
+       bCKngIPEgSnbwGwhoJKbh2cxTWDkX8DIsIpRNiW3Sjc3MTOnODVZtzg5MS8vtUjXSC83s0Qv\r
+       NaV0EyM4aCR5dzC+O6h0iFGAg1GJh/fG6dQAIdbEsuLK3EOMkhxMSqK8LjrpAUJ8SfkplRmJ\r
+       xRnxRaU5qcWHGCU4mJVEeDOKgcp5UxIrq1KL8mFS0hwsSuK8V1Ju+gsJpCeWpGanphakFsFk\r
+       ZTg4lCR4A0yBhgoWpaanVqRl5pQgpJk4OEGG8wANtwCp4S0uSMwtzkyHyJ9iVJQS5xUFSQiA\r
+       JDJK8+B6YVH9ilEc6BVh3iCQKh5gQoDrfgU0mAlocNWqNJDBJYkIKakGxvyH8RZRVsLPLwU/\r
+       8I7JUYy3niXpld9kUPxqX0L29rh1yYpxERPy96k1b0sX22Y47a+OL8PF/riL8gF9nmYz3i1+\r
+       36bDX+7JciD8w+Lu6rT1f+6f+2bxg3fR90fxTpZCXjK85pELzV88k941q8GnhONBf+jhbIn7\r
+       CzgfaccX3PLROur29pamEktxRqKhFnNRcSIADXyxWcUCAAA=\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: Sat, 29 Sep 2012 17:55:22 -0000\r
+\r
+Currently this test passes in Emacs 23 but fails in Emacs 24 (at least\r
+on some Linux distributions).\r
+---\r
+ test/emacs |   34 ++++++++++++++++++++++++++++++++++\r
+ 1 file changed, 34 insertions(+)\r
+\r
+diff --git a/test/emacs b/test/emacs\r
+index 174a9ac..1f84b91 100755\r
+--- a/test/emacs\r
++++ b/test/emacs\r
+@@ -749,4 +749,38 @@ counter=$(test_emacs \\r
+ )\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
++\r
++--abcd\r
++Content-Type: image/gif\r
++Content-Transfer-Encoding: base64\r
++Content-ID: <330@goomoji.gmail>\r
++\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
++\r
++\r
+ test_done\r
+-- \r
+1.7.10\r
+\r