From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 10D08431FAF for ; Thu, 24 Apr 2014 11:29:45 -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 1VoJ3+QtVlbh for ; Thu, 24 Apr 2014 11:29:38 -0700 (PDT) Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu [18.9.25.14]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 39F4B431FAE for ; Thu, 24 Apr 2014 11:29:38 -0700 (PDT) X-AuditID: 1209190e-f79ee6d000000c40-86-53595811332f Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) (using TLS with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP id 53.30.03136.11859535; Thu, 24 Apr 2014 14:29:37 -0400 (EDT) Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s3OITZsH001961; Thu, 24 Apr 2014 14:29:37 -0400 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) (authenticated bits=0) (User authenticated as amdragon@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s3OITYVt014684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Thu, 24 Apr 2014 14:29:35 -0400 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) (envelope-from ) id 1WdOOr-0005Xv-7r; Thu, 24 Apr 2014 14:29:33 -0400 Date: Thu, 24 Apr 2014 14:29:31 -0400 From: Austin Clements To: Mark Walters Subject: Re: [PATCH 02/11] test: New tests for Emacs charset handling Message-ID: <20140424182931.GP25817@mit.edu> References: <1398105468-14317-1-git-send-email-amdragon@mit.edu> <1398105468-14317-3-git-send-email-amdragon@mit.edu> <87mwfau70e.fsf@qmul.ac.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87mwfau70e.fsf@qmul.ac.uk> User-Agent: Mutt/1.5.21 (2010-09-15) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IRYrdT1xWMiAw2eHRc2GL1XB6L6zdnMjsw eeycdZfd49mqW8wBTFFcNimpOZllqUX6dglcGbfaJ7MXHDSvODivnbmBsVuni5GTQ0LARGLd p2csELaYxIV769m6GLk4hARmM0n8v9LCBpIQEtjIKDGnkxMicRoo8XYzC4SzhFGi6cl7JpAq FgFVieX/97OD2GwCGhLb9i9nBLFFBHQkbh9aABZnFpCW+Pa7GaxeWMBVYvWCd2A2L1DN0rZu RoihUxklmre2skIkBCVOznzCAtGsJXHj30ugBg6wQcv/cYCEOYF27Zv7Dmy+qICKxJST29gm MArNQtI9C0n3LITuBYzMqxhlU3KrdHMTM3OKU5N1i5MT8/JSi3SN9XIzS/RSU0o3MYLCmlOS bwfj14NKhxgFOBiVeHgnyEYGC7EmlhVX5h5ilORgUhLljfMDCvEl5adUZiQWZ8QXleakFh9i lOBgVhLhNQkFyvGmJFZWpRblw6SkOViUxHnfWlsFCwmkJ5akZqemFqQWwWRlODiUJHhPhAE1 ChalpqdWpGXmlCCkmTg4QYbzAA0Hq+EtLkjMLc5Mh8ifYlSUEuc1BEkIgCQySvPgemFp5xWj ONArwrxbQKp4gCkLrvsV0GAmoMEFE8JBBpckIqSkGhhddt5Zf/Ny3Kfbmd0TLzu3P1ewNnvG k+WhWeHAzrq5ae7+29cmyE09ddJg/betYdfK/nxR8di44uMpb2WjFctNA/+eu/DnDPtu3uz/ E0pLPa9z82VFet3LNtyl4zWRq/yJ+NuslJrSc6ySd2KX2H/NdrJJeZ/wKH1+/r+TU2b8STvd mF31/mW8EktxRqKhFnNRcSIAx5NXphYDAAA= Cc: notmuch@notmuchmail.org 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: Thu, 24 Apr 2014 18:29:45 -0000 Quoth Mark Walters on Apr 24 at 3:38 pm: > > On Mon, 21 Apr 2014, Austin Clements wrote: > > The test of viewing 8bit messages is known-broken. The rest pass, but > > for very fragile reasons. The next several commits will fix the > > known-broken test and make our charset handling robust. > > Hi > > On one of my systems one of these (non-broken) tests fails. I am not > sure whether I messed up my emacs/environment when doing stuff remotely > recently so it could just be my system > > > > --- > > test/T455-emacs-charsets.sh | 141 ++++++++++++++++++++++++++++++++++++++++++++ > > test/test-lib.el | 4 +- > > 2 files changed, 144 insertions(+), 1 deletion(-) > > create mode 100755 test/T455-emacs-charsets.sh > > > > diff --git a/test/T455-emacs-charsets.sh b/test/T455-emacs-charsets.sh > > new file mode 100755 > > index 0000000..a42a1d2 > > --- /dev/null > > +++ b/test/T455-emacs-charsets.sh > > @@ -0,0 +1,141 @@ > > +#!/usr/bin/env bash > > + > > +test_description="emacs notmuch-show charset handling" > > +. ./test-lib.sh > > + > > + > > +UTF8_YEN=$'\xef\xbf\xa5' > > +BIG5_YEN=$'\xa2\x44' > > + > > +# Add four messages with unusual encoding requirements: > > +# > > +# 1) text/plain in quoted-printable big5 > > +generate_message \ > > + [id]=test-plain@example.com \ > > + '[content-type]="text/plain; charset=big5"' \ > > + '[content-transfer-encoding]=quoted-printable' \ > > + '[body]="Yen: =A2=44"' > > + > > +# 2) text/plain in 8bit big5 > > +generate_message \ > > + [id]=test-plain-8bit@example.com \ > > + '[content-type]="text/plain; charset=big5"' \ > > + '[content-transfer-encoding]=8bit' \ > > + '[body]="Yen: '$BIG5_YEN'"' > > + > > +# 3) text/html in quoted-printable big5 > > +generate_message \ > > + [id]=test-html@example.com \ > > + '[content-type]="text/html; charset=big5"' \ > > + '[content-transfer-encoding]=quoted-printable' \ > > + '[body]="Yen: =A2=44"' > > + > > +# 4) application/octet-stream in quoted-printable of big5 text > > +generate_message \ > > + [id]=test-binary@example.com \ > > + '[content-type]="application/octet-stream"' \ > > + '[content-transfer-encoding]=quoted-printable' \ > > + '[body]="Yen: =A2=44"' > > + > > +notmuch new > /dev/null > > + > > +# Test rendering > > + > > +test_begin_subtest "Text parts are decoded when rendering" > > +test_emacs '(notmuch-show "id:test-plain@example.com") > > + (test-visible-output "OUTPUT.raw")' > > +awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT > > +cat <EXPECTED > > +Yen: $UTF8_YEN > > +EOF > > +test_expect_equal_file OUTPUT EXPECTED > > + > > +test_begin_subtest "8bit text parts are decoded when rendering" > > +test_emacs '(notmuch-show "id:test-plain-8bit@example.com") > > + (test-visible-output "OUTPUT.raw")' > > +awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT > > +cat <EXPECTED > > +Yen: $UTF8_YEN > > +EOF > > +test_expect_equal_file OUTPUT EXPECTED > > + > > +test_begin_subtest "HTML parts are decoded when rendering" > > +test_emacs '(notmuch-show "id:test-html@example.com") > > + (test-visible-output "OUTPUT.raw")' > > +awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT > > +cat <EXPECTED > > +[ text/html ] > > +Yen: $UTF8_YEN > > +EOF > > +test_expect_equal_file OUTPUT EXPECTED > > It's this test: I get an extra newline after the UFT8_YEN. > > This is with emacs 23.4.1 on a Debian wheezy(ish) system. > > But as said it could be my fault: I think some odd things happened when > I tried to install emacs 24 and 23 simultaneously to help testing > things. I can reproduce this. Tests that involve HTML rendering are always finicky like this since there are so many different HTML renderers. Maybe I could normalize the spacing? sed '/^$/d;s/ */ /g' or so? > Best wishes > > Mark > > > > + > > +# Test saving > > + > > +test_begin_subtest "Text parts are not decoded when saving" > > +rm -f part > > +test_emacs '(notmuch-show "id:test-plain@example.com") > > + (search-forward "Yen") > > + (let ((standard-input "\"part\"")) > > + (notmuch-show-save-part))' > > +cat <EXPECTED > > +Yen: $BIG5_YEN > > +EOF > > +test_expect_equal_file part EXPECTED > > + > > +test_begin_subtest "8bit text parts are not decoded when saving" > > +rm -f part > > +test_emacs '(notmuch-show "id:test-plain-8bit@example.com") > > + (search-forward "Yen") > > + (let ((standard-input "\"part\"")) > > + (notmuch-show-save-part))' > > +cat <EXPECTED > > +Yen: $BIG5_YEN > > +EOF > > +test_expect_equal_file part EXPECTED > > + > > +test_begin_subtest "HTML parts are not decoded when saving" > > +rm -f part > > +test_emacs '(notmuch-show "id:test-html@example.com") > > + (search-forward "Yen") > > + (let ((standard-input "\"part\"")) > > + (notmuch-show-save-part))' > > +cat <EXPECTED > > +Yen: $BIG5_YEN > > +EOF > > +test_expect_equal_file part EXPECTED > > + > > +test_begin_subtest "Binary parts are not decoded when saving" > > +rm -f part > > +test_emacs '(notmuch-show "id:test-binary@example.com") > > + (search-forward "application/") > > + (let ((standard-input "\"part\"")) > > + (notmuch-show-save-part))' > > +cat <EXPECTED > > +Yen: $BIG5_YEN > > +EOF > > +test_expect_equal_file part EXPECTED > > + > > +# Test message viewing > > + > > +test_begin_subtest "Text message are not decoded when viewing" > > +test_emacs '(notmuch-show "id:test-plain@example.com") > > + (notmuch-show-view-raw-message) > > + (test-visible-output "OUTPUT.raw")' > > +awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT > > +cat <EXPECTED > > +Yen: =A2=44 > > +EOF > > +test_expect_equal_file OUTPUT EXPECTED > > + > > +test_begin_subtest "8bit text message are not decoded when viewing" > > +test_subtest_known_broken > > +test_emacs '(notmuch-show "id:test-plain-8bit@example.com") > > + (notmuch-show-view-raw-message) > > + (test-visible-output "OUTPUT.raw")' > > +awk 'show {print} /^$/ {show=1}' < OUTPUT.raw > OUTPUT > > +cat <EXPECTED > > +Yen: $BIG5_YEN > > +EOF > > +test_expect_equal_file OUTPUT EXPECTED > > + > > +test_done > > diff --git a/test/test-lib.el b/test/test-lib.el > > index 437f83f..dd3446e 100644 > > --- a/test/test-lib.el > > +++ b/test/test-lib.el > > @@ -57,7 +57,9 @@ (defun test-output (&optional filename) > > (defun test-visible-output (&optional filename) > > "Save visible text in current buffer to file FILENAME. Default > > FILENAME is OUTPUT." > > - (let ((text (visible-buffer-string))) > > + (let ((text (visible-buffer-string)) > > + ;; Tests expect output in UTF-8 encoding > > + (coding-system-for-write 'utf-8)) > > (with-temp-file (or filename "OUTPUT") (insert text)))) > > > > (defun visible-buffer-string ()