1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 95ACB431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 29 Aug 2012 18:13:24 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id WjDf2+8T0rrA for <notmuch@notmuchmail.org>;
\r
16 Wed, 29 Aug 2012 18:13:22 -0700 (PDT)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id C3D66431FAE
\r
21 for <notmuch@notmuchmail.org>; Wed, 29 Aug 2012 18:13:22 -0700 (PDT)
\r
22 Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.89.108] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1T6tJt-0002at-4t; Wed, 29 Aug 2012 22:13:21 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1T6tJn-0004Fc-8r; Wed, 29 Aug 2012 22:13:11 -0300
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] test: canonicalize content-type in "Sending a message via
\r
35 Date: Wed, 29 Aug 2012 22:12:56 -0300
\r
36 Message-Id: <1346289176-15884-1-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
39 Cc: David Bremner <bremner@debian.org>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Thu, 30 Aug 2012 01:13:24 -0000
\r
54 From: David Bremner <bremner@debian.org>
\r
56 The version of message.el in emacs24 omits the charset=us-ascii,
\r
57 causing the current version of this test to fail. Here we just ask
\r
58 that the content-type start with "text/plain"
\r
61 Alternatively, somebody might want to dig into message.el and
\r
62 understand why it behaves differently in emacs24. I could not
\r
63 replicate the omission of charset=us-ascii sending a message
\r
66 test/emacs | 5 +++--
\r
67 1 file changed, 3 insertions(+), 2 deletions(-)
\r
69 diff --git a/test/emacs b/test/emacs
\r
70 index afe35ba..6fab4db 100755
\r
73 @@ -169,7 +169,8 @@ emacs_deliver_message \
\r
74 (insert "To: user@example.com\n")'
\r
76 -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \
\r
77 - -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' < sent_message >OUTPUT
\r
78 + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \
\r
79 + -e s',^Content-Type: text/plain.*$,Content-Type: XXX,' < sent_message >OUTPUT
\r
81 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
82 To: user@example.com
\r
83 @@ -178,7 +179,7 @@ Date: 01 Jan 2000 12:00:00 -0000
\r
84 User-Agent: Notmuch/XXX Emacs/XXX
\r
87 -Content-Type: text/plain; charset=us-ascii
\r
90 This is a test that messages are sent via SMTP
\r