--- /dev/null
+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 A1CFF431FBC\r
+ for <notmuch@notmuchmail.org>; Mon, 21 Apr 2014 11:38:17 -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 JaJJ5P7zFyMU for <notmuch@notmuchmail.org>;\r
+ Mon, 21 Apr 2014 11:38:13 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+ [18.7.68.36])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 0A314431FC4\r
+ for <notmuch@notmuchmail.org>; Mon, 21 Apr 2014 11:38:00 -0700 (PDT)\r
+X-AuditID: 12074424-f79e26d000000c70-d5-53556588b234\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+ (using TLS with cipher AES256-SHA (256/256 bits))\r
+ (Client did not present a certificate)\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 70.45.03184.88565535; Mon, 21 Apr 2014 14:38:00 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s3LIbuSc022317; \r
+ Mon, 21 Apr 2014 14:37:57 -0400\r
+Received: from drake.dyndns.org\r
+ (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [216.15.114.40]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s3LIbsGG029710\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 21 Apr 2014 14:37:56 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1WcJ6I-0003ku-BI; Mon, 21 Apr 2014 14:37:54 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 02/11] test: New tests for Emacs charset handling\r
+Date: Mon, 21 Apr 2014 14:37:39 -0400\r
+Message-Id: <1398105468-14317-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <1398105468-14317-1-git-send-email-amdragon@mit.edu>\r
+References: <1398105468-14317-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6nrtuRGhps8PkFm8X1mzOZHRg9nq26\r
+ xRzAGMVlk5Kak1mWWqRvl8CV8eDjOsaC49oVyztOMDYwblDpYuTkkBAwkWh4t4IdwhaTuHBv\r
+ PVsXIxeHkMBsJokfcy6yQjgbGSW+zn3PDuHcYZK496ePEcKZyyixtn0dI0g/m4CGxLb9y8Fs\r
+ EQFpiZ13ZwO1c3AwC6hJ/OkCWycs4CgxY+pzsHUsAqoSH07+YgaxeQUcJI40H2CBOENO4uSx\r
+ yawgNidQfdvql2D1QkA1G/auYZrAyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJeXmqRrrlebmaJ\r
+ XmpK6SZGcNi4qOxgbD6kdIhRgINRiYdXwiA0WIg1say4MvcQoyQHk5Io76sooBBfUn5KZUZi\r
+ cUZ8UWlOavEhRgkOZiUR3vWaQDnelMTKqtSifJiUNAeLkjjvW2urYCGB9MSS1OzU1ILUIpis\r
+ DAeHkgTvwhSgRsGi1PTUirTMnBKENBMHJ8hwHqDhF0FqeIsLEnOLM9Mh8qcYFaXEedtAEgIg\r
+ iYzSPLheWFy/YhQHekWYtwWkigeYEuC6XwENZgIa/GRLCMjgkkSElFQD42qpmC/Nff//zhYP\r
+ X6KVFXfvjkdRQXbtydg/Vm/uv9rmUzpT/fevrU/zQyrWWtTI3G50KVd2Xs65TMRzW3RbnEjK\r
+ pvp04xfN23oOXjHv3Kc6TeF31JO56w+dv551Zde6iniWNarTvI91VTkbme5YcvTD7TN1h6vz\r
+ FshetvJ4VnUtRbNKyvuemRJLcUaioRZzUXEiAJByPTnGAgAA\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, 21 Apr 2014 18:38:17 -0000\r
+\r
+The test of viewing 8bit messages is known-broken. The rest pass, but\r
+for very fragile reasons. The next several commits will fix the\r
+known-broken test and make our charset handling robust.\r
+---\r
+ test/T455-emacs-charsets.sh | 141 ++++++++++++++++++++++++++++++++++++++++++++\r
+ test/test-lib.el | 4 +-\r
+ 2 files changed, 144 insertions(+), 1 deletion(-)\r
+ create mode 100755 test/T455-emacs-charsets.sh\r
+\r
+diff --git a/test/T455-emacs-charsets.sh b/test/T455-emacs-charsets.sh\r
+new file mode 100755\r
+index 0000000..a42a1d2\r
+--- /dev/null\r
++++ b/test/T455-emacs-charsets.sh\r
+@@ -0,0 +1,141 @@\r
++#!/usr/bin/env bash\r
++\r
++test_description="emacs notmuch-show charset handling"\r
++. ./test-lib.sh\r
++\r
++\r
++UTF8_YEN=$'\xef\xbf\xa5'\r
++BIG5_YEN=$'\xa2\x44'\r
++\r
++# Add four messages with unusual encoding requirements:\r
++#\r
++# 1) text/plain in quoted-printable big5\r
++generate_message \\r
++ [id]=test-plain@example.com \\r
++ '[content-type]="text/plain; charset=big5"' \\r
++ '[content-transfer-encoding]=quoted-printable' \\r
++ '[body]="Yen: =A2=44"'\r
++\r
++# 2) text/plain in 8bit big5\r
++generate_message \\r
++ [id]=test-plain-8bit@example.com \\r
++ '[content-type]="text/plain; charset=big5"' \\r
++ '[content-transfer-encoding]=8bit' \\r
++ '[body]="Yen: '$BIG5_YEN'"'\r
++\r
++# 3) text/html in quoted-printable big5\r
++generate_message \\r
++ [id]=test-html@example.com \\r
++ '[content-type]="text/html; charset=big5"' \\r
++ '[content-transfer-encoding]=quoted-printable' \\r
++ '[body]="<html><body>Yen: =A2=44</body></html>"'\r
++\r
++# 4) application/octet-stream in quoted-printable of big5 text\r
++generate_message \\r
++ [id]=test-binary@example.com \\r
++ '[content-type]="application/octet-stream"' \\r
++ '[content-transfer-encoding]=quoted-printable' \\r
++ '[body]="Yen: =A2=44"'\r
++\r
++notmuch new > /dev/null\r
++\r
++# Test rendering\r
++\r
++test_begin_subtest "Text parts are decoded when rendering"\r
++test_emacs '(notmuch-show "id:test-plain@example.com")\r
++ (test-visible-output "OUTPUT.raw")'\r
++awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT\r
++cat <<EOF >EXPECTED\r
++Yen: $UTF8_YEN\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "8bit text parts are decoded when rendering"\r
++test_emacs '(notmuch-show "id:test-plain-8bit@example.com")\r
++ (test-visible-output "OUTPUT.raw")'\r
++awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT\r
++cat <<EOF >EXPECTED\r
++Yen: $UTF8_YEN\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "HTML parts are decoded when rendering"\r
++test_emacs '(notmuch-show "id:test-html@example.com")\r
++ (test-visible-output "OUTPUT.raw")'\r
++awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT\r
++cat <<EOF >EXPECTED\r
++[ text/html ]\r
++Yen: $UTF8_YEN\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++# Test saving\r
++\r
++test_begin_subtest "Text parts are not decoded when saving"\r
++rm -f part\r
++test_emacs '(notmuch-show "id:test-plain@example.com")\r
++ (search-forward "Yen")\r
++ (let ((standard-input "\"part\""))\r
++ (notmuch-show-save-part))'\r
++cat <<EOF >EXPECTED\r
++Yen: $BIG5_YEN\r
++EOF\r
++test_expect_equal_file part EXPECTED\r
++\r
++test_begin_subtest "8bit text parts are not decoded when saving"\r
++rm -f part\r
++test_emacs '(notmuch-show "id:test-plain-8bit@example.com")\r
++ (search-forward "Yen")\r
++ (let ((standard-input "\"part\""))\r
++ (notmuch-show-save-part))'\r
++cat <<EOF >EXPECTED\r
++Yen: $BIG5_YEN\r
++EOF\r
++test_expect_equal_file part EXPECTED\r
++\r
++test_begin_subtest "HTML parts are not decoded when saving"\r
++rm -f part\r
++test_emacs '(notmuch-show "id:test-html@example.com")\r
++ (search-forward "Yen")\r
++ (let ((standard-input "\"part\""))\r
++ (notmuch-show-save-part))'\r
++cat <<EOF >EXPECTED\r
++<html><body>Yen: $BIG5_YEN</body></html>\r
++EOF\r
++test_expect_equal_file part EXPECTED\r
++\r
++test_begin_subtest "Binary parts are not decoded when saving"\r
++rm -f part\r
++test_emacs '(notmuch-show "id:test-binary@example.com")\r
++ (search-forward "application/")\r
++ (let ((standard-input "\"part\""))\r
++ (notmuch-show-save-part))'\r
++cat <<EOF >EXPECTED\r
++Yen: $BIG5_YEN\r
++EOF\r
++test_expect_equal_file part EXPECTED\r
++\r
++# Test message viewing\r
++\r
++test_begin_subtest "Text message are not decoded when viewing"\r
++test_emacs '(notmuch-show "id:test-plain@example.com")\r
++ (notmuch-show-view-raw-message)\r
++ (test-visible-output "OUTPUT.raw")'\r
++awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT\r
++cat <<EOF >EXPECTED\r
++Yen: =A2=44\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_begin_subtest "8bit text message are not decoded when viewing"\r
++test_subtest_known_broken\r
++test_emacs '(notmuch-show "id:test-plain-8bit@example.com")\r
++ (notmuch-show-view-raw-message)\r
++ (test-visible-output "OUTPUT.raw")'\r
++awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT\r
++cat <<EOF >EXPECTED\r
++Yen: $BIG5_YEN\r
++EOF\r
++test_expect_equal_file OUTPUT EXPECTED\r
++\r
++test_done\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 437f83f..dd3446e 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -57,7 +57,9 @@ (defun test-output (&optional filename)\r
+ (defun test-visible-output (&optional filename)\r
+ "Save visible text in current buffer to file FILENAME. Default\r
+ FILENAME is OUTPUT."\r
+- (let ((text (visible-buffer-string)))\r
++ (let ((text (visible-buffer-string))\r
++ ;; Tests expect output in UTF-8 encoding\r
++ (coding-system-for-write 'utf-8))\r
+ (with-temp-file (or filename "OUTPUT") (insert text))))\r
+ \r
+ (defun visible-buffer-string ()\r
+-- \r
+1.9.1\r
+\r
projects / notmuch-archives.git / commitdiff