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