--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 40D0E431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 20:49:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id JPWziMe5ZhWj for <notmuch@notmuchmail.org>;\r
+ Thu, 30 Aug 2012 20:49:55 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 1161D431FAE\r
+ for <notmuch@notmuchmail.org>; Thu, 30 Aug 2012 20:49:55 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-a7-5040346211fd\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 11.34.02244.26430405; Thu, 30 Aug 2012 23:49:54 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q7V3nrMR008226; \r
+ Thu, 30 Aug 2012 23:49:53 -0400\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q7V3noYs002655\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Thu, 30 Aug 2012 23:49:51 -0400 (EDT)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1T7IEw-00085W-Ax; Thu, 30 Aug 2012 23:49:50 -0400\r
+Date: Thu, 30 Aug 2012 23:49:50 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: david@tethera.net\r
+Subject: Re: [PATCH] test: canonicalize content-type in "Sending a message\r
+ via (fake) SMTP"\r
+Message-ID: <20120831034934.GG11179@mit.edu>\r
+References: <20120830013653.GF11179@mit.edu>\r
+ <1346369074-8366-1-git-send-email-david@tethera.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1346369074-8366-1-git-send-email-david@tethera.net>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFprBKsWRmVeSWpSXmKPExsUixCmqrZtk4hBgsOqonMXGZT+ZLW60djNa\r
+ XL85k9mB2eNX21xmj2erbjF7bDn0njmAOYrLJiU1J7MstUjfLoErY/2ifraCtdwVG74/Z29g\r
+ bOXsYuTgkBAwkbh4CsjkBDLFJC7cW88GYgsJ7GOUuNOv3MXIBWRvYJRY8egEE4Rzkkli9dNG\r
+ VghnCaPEuv+d7CAtLAKqEqcuLWEBsdkENCS27V/OCGKLCIhKnN40iRXEZhawl1g0exJYvbBA\r
+ rETX10dg9bwCOhKLvq1iglidLHFvxR9WiLigxMmZT1ggerUkbvx7yQRyNbOAtMTyfxwgYU4B\r
+ R4nXM+eAlYsKqEhMObmNbQKj0Cwk3bOQdM9C6F7AyLyKUTYlt0o3NzEzpzg1Wbc4OTEvL7VI\r
+ 10IvN7NELzWldBMjKNDZXVR3ME44pHSIUYCDUYmHt3KNfYAQa2JZcWXuIUZJDiYlUd4Xhg4B\r
+ QnxJ+SmVGYnFGfFFpTmpxYcYJTiYlUR4Z30GKudNSaysSi3Kh0lJc7AoifPeSLnpLySQnliS\r
+ mp2aWpBaBJOV4eBQkuDtMwIaKliUmp5akZaZU4KQZuLgBBnOAzRcxBiohre4IDG3ODMdIn+K\r
+ UZfj+tezdxmFWPLy81KlxHnXgAwSACnKKM2DmwNLUK8YxYHeEub9AFLFA0xucJNeAS1hAloi\r
+ pwHyQXFJIkJKqoFxamL8vRKdOyqvGHbo1DTVLVt0JsjZ6vzCXm6tRC/FFSET7giHanyIW8TI\r
+ XfD3/Q6uXnlffsHrmYmy917GvCgRmBFUnJ71U3pbtknVzfLJfg8MHBWf6K4V4XI5s41L5fb6\r
+ f6d/ah3tl3wbrziP4bsL14ljUQdTc6SUnmyxNZhal5LOxXzHJ0uJpTgj0VCLuag4EQDDXxGC\r
+ KwMAAA==\r
+Cc: notmuch@notmuchmail.org, David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 31 Aug 2012 03:49:57 -0000\r
+\r
+LGTM.\r
+\r
+Quoth david@tethera.net on Aug 30 at 8:24 pm:\r
+> From: David Bremner <bremner@debian.org>\r
+> \r
+> The version of message.el in emacs24 omits the charset=us-ascii,\r
+> causing the current version of this test to fail. With this patch, we\r
+> accept either option. According to RFC 2046, they are semantically\r
+> equivalent.\r
+> ---\r
+> \r
+> as discussed on IRC, the $ is not quite as nice as \b, but it is\r
+> POSIX.2, at least according to "man 7 regex"\r
+> \r
+> test/emacs | 5 +++--\r
+> 1 file changed, 3 insertions(+), 2 deletions(-)\r
+> \r
+> diff --git a/test/emacs b/test/emacs\r
+> index afe35ba..5d118b6 100755\r
+> --- a/test/emacs\r
+> +++ b/test/emacs\r
+> @@ -169,7 +169,8 @@ emacs_deliver_message \\r
+> (insert "To: user@example.com\n")'\r
+> sed \\r
+> -e s',^User-Agent: Notmuch/.* Emacs/.*,User-Agent: Notmuch/XXX Emacs/XXX,' \\r
+> - -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' < sent_message >OUTPUT\r
+> + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \\r
+> + -e s',^\(Content-Type: text/plain\); charset=us-ascii$,\1,' < sent_message >OUTPUT\r
+> cat <<EOF >EXPECTED\r
+> From: Notmuch Test Suite <test_suite@notmuchmail.org>\r
+> To: user@example.com\r
+> @@ -178,7 +179,7 @@ Date: 01 Jan 2000 12:00:00 -0000\r
+> User-Agent: Notmuch/XXX Emacs/XXX\r
+> Message-ID: <XXX>\r
+> MIME-Version: 1.0\r
+> -Content-Type: text/plain; charset=us-ascii\r
+> +Content-Type: text/plain\r
+> \r
+> This is a test that messages are sent via SMTP\r
+> EOF\r