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 F0E2D431FAF
\r
6 for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 16:24:56 -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 71YeM-tsvMvH for <notmuch@notmuchmail.org>;
\r
16 Thu, 30 Aug 2012 16:24:55 -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 F3C54431FAE
\r
21 for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 16:24:54 -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 1T7E6T-00048P-Nl; Thu, 30 Aug 2012 20:24:53 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1T7E6O-0002Cl-AA; Thu, 30 Aug 2012 20:24:44 -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: Thu, 30 Aug 2012 20:24:34 -0300
\r
36 Message-Id: <1346369074-8366-1-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <20120830013653.GF11179@mit.edu>
\r
39 References: <20120830013653.GF11179@mit.edu>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Thu, 30 Aug 2012 23:24:57 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 The version of message.el in emacs24 omits the charset=us-ascii,
\r
59 causing the current version of this test to fail. With this patch, we
\r
60 accept either option. According to RFC 2046, they are semantically
\r
64 as discussed on IRC, the $ is not quite as nice as \b, but it is
\r
65 POSIX.2, at least according to "man 7 regex"
\r
67 test/emacs | 5 +++--
\r
68 1 file changed, 3 insertions(+), 2 deletions(-)
\r
70 diff --git a/test/emacs b/test/emacs
\r
71 index afe35ba..5d118b6 100755
\r
74 @@ -169,7 +169,8 @@ emacs_deliver_message \
\r
75 (insert "To: user@example.com\n")'
\r
77 -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \
\r
78 - -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' < sent_message >OUTPUT
\r
79 + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \
\r
80 + -e s',^\(Content-Type: text/plain\); charset=us-ascii$,\1,' < sent_message >OUTPUT
\r
82 From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
83 To: user@example.com
\r
84 @@ -178,7 +179,7 @@ Date: 01 Jan 2000 12:00:00 -0000
\r
85 User-Agent: Notmuch/XXX Emacs/XXX
\r
88 -Content-Type: text/plain; charset=us-ascii
\r
89 +Content-Type: text/plain
\r
91 This is a test that messages are sent via SMTP
\r