From c71fe3405acc3f00744b37da24293209a2710397 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 25 Apr 2014 16:57:48 +0300 Subject: [PATCH] Re: [PATCH 02/11] test: New tests for Emacs charset handling --- 47/08f069076df5bf04f1ffebc584ba877f0ec45d | 273 ++++++++++++++++++++++ 1 file changed, 273 insertions(+) create mode 100644 47/08f069076df5bf04f1ffebc584ba877f0ec45d diff --git a/47/08f069076df5bf04f1ffebc584ba877f0ec45d b/47/08f069076df5bf04f1ffebc584ba877f0ec45d new file mode 100644 index 000000000..126952513 --- /dev/null +++ b/47/08f069076df5bf04f1ffebc584ba877f0ec45d @@ -0,0 +1,273 @@ +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 397EC431FAF + for ; Fri, 25 Apr 2014 06:58:03 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 4Ro395AjkMrC for ; + Fri, 25 Apr 2014 06:57:59 -0700 (PDT) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id B20BE431FB6 + for ; Fri, 25 Apr 2014 06:57:58 -0700 (PDT) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id 32B5D10008C; + Fri, 25 Apr 2014 16:57:49 +0300 (EEST) +From: Tomi Ollila +To: Austin Clements , + Mark Walters +Subject: Re: [PATCH 02/11] test: New tests for Emacs charset handling +In-Reply-To: <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> <20140424182931.GP25817@mit.edu> +User-Agent: Notmuch/0.17+201~g56da2d6 (http://notmuchmail.org) Emacs/24.3.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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: Fri, 25 Apr 2014 13:58:03 -0000 + +On Thu, Apr 24 2014, Austin Clements wrote: + +> 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? + + +IIRC something was done there to unify renderers... + +id:1336316175-17852-1-git-send-email-awg+notmuch@xvx.ca + +... that (or it's alternative(*) ;) could be made global + +Tomi + +(*) id:m2fwbc4irf.fsf@guru.guru-group.fi + + +> +>> 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 () +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2