--- /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 10D08431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 24 Apr 2014 11:29:45 -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 1VoJ3+QtVlbh for <notmuch@notmuchmail.org>;\r
+ Thu, 24 Apr 2014 11:29:38 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
+ [18.9.25.14])\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 39F4B431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 24 Apr 2014 11:29:38 -0700 (PDT)\r
+X-AuditID: 1209190e-f79ee6d000000c40-86-53595811332f\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-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 53.30.03136.11859535; Thu, 24 Apr 2014 14:29:37 -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 s3OITZsH001961; \r
+ Thu, 24 Apr 2014 14:29:37 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (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 s3OITYVt014684\r
+ (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+ Thu, 24 Apr 2014 14:29:35 -0400\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1WdOOr-0005Xv-7r; Thu, 24 Apr 2014 14:29:33 -0400\r
+Date: Thu, 24 Apr 2014 14:29:31 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Subject: Re: [PATCH 02/11] test: New tests for Emacs charset handling\r
+Message-ID: <20140424182931.GP25817@mit.edu>\r
+References: <1398105468-14317-1-git-send-email-amdragon@mit.edu>\r
+ <1398105468-14317-3-git-send-email-amdragon@mit.edu>\r
+ <87mwfau70e.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <87mwfau70e.fsf@qmul.ac.uk>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IRYrdT1xWMiAw2eHRc2GL1XB6L6zdnMjsw\r
+ eeycdZfd49mqW8wBTFFcNimpOZllqUX6dglcGbfaJ7MXHDSvODivnbmBsVuni5GTQ0LARGLd\r
+ p2csELaYxIV769m6GLk4hARmM0n8v9LCBpIQEtjIKDGnkxMicRoo8XYzC4SzhFGi6cl7JpAq\r
+ FgFVieX/97OD2GwCGhLb9i9nBLFFBHQkbh9aABZnFpCW+Pa7GaxeWMBVYvWCd2A2L1DN0rZu\r
+ RoihUxklmre2skIkBCVOznzCAtGsJXHj30ugBg6wQcv/cYCEOYF27Zv7Dmy+qICKxJST29gm\r
+ MArNQtI9C0n3LITuBYzMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3SN9XIzS/RSU0o3MYLCmlOS\r
+ bwfj14NKhxgFOBiVeHgnyEYGC7EmlhVX5h5ilORgUhLljfMDCvEl5adUZiQWZ8QXleakFh9i\r
+ lOBgVhLhNQkFyvGmJFZWpRblw6SkOViUxHnfWlsFCwmkJ5akZqemFqQWwWRlODiUJHhPhAE1\r
+ ChalpqdWpGXmlCCkmTg4QYbzAA0Hq+EtLkjMLc5Mh8ifYlSUEuc1BEkIgCQySvPgemFp5xWj\r
+ ONArwrxbQKp4gCkLrvsV0GAmoMEFE8JBBpckIqSkGhhddt5Zf/Ny3Kfbmd0TLzu3P1ewNnvG\r
+ k+WhWeHAzrq5ae7+29cmyE09ddJg/betYdfK/nxR8di44uMpb2WjFctNA/+eu/DnDPtu3uz/\r
+ E0pLPa9z82VFet3LNtyl4zWRq/yJ+NuslJrSc6ySd2KX2H/NdrJJeZ/wKH1+/r+TU2b8STvd\r
+ mF31/mW8EktxRqKhFnNRcSIAx5NXphYDAAA=\r
+Cc: notmuch@notmuchmail.org\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: Thu, 24 Apr 2014 18:29:45 -0000\r
+\r
+Quoth Mark Walters on Apr 24 at 3:38 pm:\r
+> \r
+> On Mon, 21 Apr 2014, Austin Clements <amdragon@MIT.EDU> wrote:\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
+> Hi \r
+> \r
+> On one of my systems one of these (non-broken) tests fails. I am not\r
+> sure whether I messed up my emacs/environment when doing stuff remotely\r
+> recently so it could just be my system\r
+> \r
+> \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
+> It's this test: I get an extra newline after the UFT8_YEN. \r
+> \r
+> This is with emacs 23.4.1 on a Debian wheezy(ish) system.\r
+> \r
+> But as said it could be my fault: I think some odd things happened when\r
+> I tried to install emacs 24 and 23 simultaneously to help testing\r
+> things.\r
+\r
+I can reproduce this. Tests that involve HTML rendering are always\r
+finicky like this since there are so many different HTML renderers.\r
+Maybe I could normalize the spacing? sed '/^$/d;s/ */ /g' or so?\r
+\r
+> Best wishes\r
+> \r
+> Mark\r
+> \r
+> \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
projects / notmuch-archives.git / commitdiff