1 Return-Path: <amdragon@mit.edu>
\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 D8BCC431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 29 Aug 2012 18:36:58 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 7bYmbEV10FNc for <notmuch@notmuchmail.org>;
\r
16 Wed, 29 Aug 2012 18:36:58 -0700 (PDT)
\r
17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU
\r
19 by olra.theworths.org (Postfix) with ESMTP id 37E30431FAE
\r
20 for <notmuch@notmuchmail.org>; Wed, 29 Aug 2012 18:36:58 -0700 (PDT)
\r
21 X-AuditID: 1209190c-b7f806d000006b87-aa-503ec3b92881
\r
22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])
\r
23 by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP
\r
24 id A6.85.27527.9B3CE305; Wed, 29 Aug 2012 21:36:57 -0400 (EDT)
\r
25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])
\r
26 by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q7U1au0p009629;
\r
27 Wed, 29 Aug 2012 21:36:56 -0400
\r
28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])
\r
29 (authenticated bits=0)
\r
30 (User authenticated as amdragon@ATHENA.MIT.EDU)
\r
31 by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q7U1arZQ025743
\r
32 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);
\r
33 Wed, 29 Aug 2012 21:36:54 -0400 (EDT)
\r
34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)
\r
35 (envelope-from <amdragon@mit.edu>)
\r
36 id 1T6tgj-0004Ar-7s; Wed, 29 Aug 2012 21:36:53 -0400
\r
37 Date: Wed, 29 Aug 2012 21:36:53 -0400
\r
38 From: Austin Clements <amdragon@MIT.EDU>
\r
39 To: david@tethera.net
\r
40 Subject: Re: [PATCH] test: canonicalize content-type in "Sending a message
\r
42 Message-ID: <20120830013653.GF11179@mit.edu>
\r
43 References: <1346289176-15884-1-git-send-email-david@tethera.net>
\r
45 Content-Type: text/plain; charset=us-ascii
\r
46 Content-Disposition: inline
\r
47 In-Reply-To: <1346289176-15884-1-git-send-email-david@tethera.net>
\r
48 User-Agent: Mutt/1.5.21 (2010-09-15)
\r
49 X-Brightmail-Tracker:
\r
50 H4sIAAAAAAAAA+NgFprJKsWRmVeSWpSXmKPExsUixG6nrrvzsF2AwcHdBhYbl/1ktrjR2s1o
\r
51 cf3mTGYHZo9fbXOZPZ6tusXsseXQe+YA5igum5TUnMyy1CJ9uwSujBkP8wta+CpWX2hiaWBc
\r
52 zd3FyMkhIWAiMWXDZyYIW0ziwr31bF2MXBxCAvsYJf7d28sK4WxglLh75xQzhHOSSeLZmgXs
\r
53 EM4SRomvh+ezgvSzCKhKLPt2FGwWm4CGxLb9yxlBbBEBUYnTmyaB1TAL2Essmj2JHcQWFoiV
\r
54 6Pr6iAXE5hXQkbjfvROsV0jAUeLa32tMEHFBiZMzn7BA9GpJ3Pj3EijOAWRLSyz/xwES5hRw
\r
55 knjR0Ag2XlRARWLKyW1sExiFZiHpnoWkexZC9wJG5lWMsim5Vbq5iZk5xanJusXJiXl5qUW6
\r
56 hnq5mSV6qSmlmxhBoc4pybOD8c1BpUOMAhyMSjy8zv52AUKsiWXFlbmHGCU5mJREed0PAYX4
\r
57 kvJTKjMSizPii0pzUosPMUpwMCuJ8H5aCZTjTUmsrEotyodJSXOwKInzXk656S8kkJ5Ykpqd
\r
58 mlqQWgSTleHgUJLgPQEyVLAoNT21Ii0zpwQhzcTBCTKcB2j4KpAa3uKCxNzizHSI/ClGXY7r
\r
59 X8/eZRRiycvPS5US550GUiQAUpRRmgc3B5aiXjGKA70lzLsFpIoHmN7gJr0CWsIEtGS/ojXI
\r
60 kpJEhJRUA2P2b5lJ3RKMXVUdez8Y/3PT2u86Y+GCV2XxlV/fzlxwfsGVbVePfHl0onjK9fyk
\r
61 rruTgsNVr0xzXO51ff+X5NaJN9sX5BR6l9dJ102TWDExcGbppZdNnA/7GtVj1kTy7J8pPOuu
\r
62 6/VJ300zpgbcPDBPXKHq64eH/U8PHw1eJ/dmR3D81zbXp7NfKrEUZyQaajEXFScCAJrA9m0s AwAA
\r
63 Cc: notmuch@notmuchmail.org, David Bremner <bremner@debian.org>
\r
64 X-BeenThere: notmuch@notmuchmail.org
\r
65 X-Mailman-Version: 2.1.13
\r
67 List-Id: "Use and development of the notmuch mail system."
\r
68 <notmuch.notmuchmail.org>
\r
69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
70 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
72 List-Post: <mailto:notmuch@notmuchmail.org>
\r
73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
75 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
76 X-List-Received-Date: Thu, 30 Aug 2012 01:36:59 -0000
\r
78 Quoth david@tethera.net on Aug 29 at 10:12 pm:
\r
79 > From: David Bremner <bremner@debian.org>
\r
81 > The version of message.el in emacs24 omits the charset=us-ascii,
\r
82 > causing the current version of this test to fail. Here we just ask
\r
83 > that the content-type start with "text/plain"
\r
86 > Alternatively, somebody might want to dig into message.el and
\r
87 > understand why it behaves differently in emacs24. I could not
\r
88 > replicate the omission of charset=us-ascii sending a message
\r
91 > test/emacs | 5 +++--
\r
92 > 1 file changed, 3 insertions(+), 2 deletions(-)
\r
94 > diff --git a/test/emacs b/test/emacs
\r
95 > index afe35ba..6fab4db 100755
\r
98 > @@ -169,7 +169,8 @@ emacs_deliver_message \
\r
99 > (insert "To: user@example.com\n")'
\r
101 > -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \
\r
102 > - -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' < sent_message >OUTPUT
\r
103 > + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \
\r
104 > + -e s',^Content-Type: text/plain.*$,Content-Type: XXX,' < sent_message >OUTPUT
\r
106 Maybe something more exact? Since us-ascii is the default charset and
\r
107 equivalent to not specifying a charset (which is presumably related to
\r
108 the change in Emacs 24), how about
\r
109 s',^\(Content-Type: text/plain\); charset=us-ascii\b,\1,'
\r
110 ? That would canonicalize away only the default-valued part.
\r
112 > cat <<EOF >EXPECTED
\r
113 > From: Notmuch Test Suite <test_suite@notmuchmail.org>
\r
114 > To: user@example.com
\r
115 > @@ -178,7 +179,7 @@ Date: 01 Jan 2000 12:00:00 -0000
\r
116 > User-Agent: Notmuch/XXX Emacs/XXX
\r
117 > Message-ID: <XXX>
\r
118 > MIME-Version: 1.0
\r
119 > -Content-Type: text/plain; charset=us-ascii
\r
120 > +Content-Type: XXX
\r
122 > This is a test that messages are sent via SMTP
\r