From f7623db7eba9679f1c19420b96b090f31aa647c2 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Fri, 25 Apr 2014 07:18:35 +0100 Subject: [PATCH] Re: [PATCH 02/11] test: New tests for Emacs charset handling --- 42/336339e8539409c32d193a3286aea18714320f | 191 ++++++++++++++++++++++ 1 file changed, 191 insertions(+) create mode 100644 42/336339e8539409c32d193a3286aea18714320f diff --git a/42/336339e8539409c32d193a3286aea18714320f b/42/336339e8539409c32d193a3286aea18714320f new file mode 100644 index 000000000..76cc1687e --- /dev/null +++ b/42/336339e8539409c32d193a3286aea18714320f @@ -0,0 +1,191 @@ +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 BE204431FAF + for ; Thu, 24 Apr 2014 23:18:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.502 +X-Spam-Level: +X-Spam-Status: No, score=0.502 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, 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 15P6tpxUZkYj for ; + Thu, 24 Apr 2014 23:18:44 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D7C75431FAE + for ; Thu, 24 Apr 2014 23:18:43 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1WdZT3-0004EA-3t; Fri, 25 Apr 2014 07:18:37 +0100 +Received: from 5751dfa2.skybroadband.com ([87.81.223.162] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1WdZT2-00035Q-Lu; Fri, 25 Apr 2014 07:18:36 +0100 +From: Mark Walters +To: Austin Clements +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.15.2+615~g78e3a93 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Fri, 25 Apr 2014 07:18:35 +0100 +Message-ID: <87fvl2szib.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 87.81.223.162 +X-QM-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 26b5b44b3f4a251b95c1a8ec010ed878 (of first 20000 bytes) +X-SpamAssassin-Score: -0.1 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -0.1 points. + Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.1 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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 06:18:48 -0000 + +On Thu, 24 Apr 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? + +That sounds plausible. What output would you get if the test genuinely +fails? I guess the key thing is to try and make sure the test doesn't +pass in that case. + +Best wishes + +Mark -- 2.26.2