From d2274f68f96bf8cad97e7a5fdea610ac7f523488 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 30 Aug 2012 22:12:56 +2100 Subject: [PATCH] [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP" --- ae/04e1983306cf19bcb26f18f030d3dd14565ed2 | 94 +++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 ae/04e1983306cf19bcb26f18f030d3dd14565ed2 diff --git a/ae/04e1983306cf19bcb26f18f030d3dd14565ed2 b/ae/04e1983306cf19bcb26f18f030d3dd14565ed2 new file mode 100644 index 000000000..9c389243b --- /dev/null +++ b/ae/04e1983306cf19bcb26f18f030d3dd14565ed2 @@ -0,0 +1,94 @@ +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 95ACB431FAF + for ; Wed, 29 Aug 2012 18:13:24 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 WjDf2+8T0rrA for ; + Wed, 29 Aug 2012 18:13:22 -0700 (PDT) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id C3D66431FAE + for ; Wed, 29 Aug 2012 18:13:22 -0700 (PDT) +Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.89.108] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) + (envelope-from ) + id 1T6tJt-0002at-4t; Wed, 29 Aug 2012 22:13:21 -0300 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1T6tJn-0004Fc-8r; Wed, 29 Aug 2012 22:13:11 -0300 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH] test: canonicalize content-type in "Sending a message via + (fake) SMTP" +Date: Wed, 29 Aug 2012 22:12:56 -0300 +Message-Id: <1346289176-15884-1-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +X-Spam_bar: - +Cc: 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: Thu, 30 Aug 2012 01:13:24 -0000 + +From: David Bremner + +The version of message.el in emacs24 omits the charset=us-ascii, +causing the current version of this test to fail. Here we just ask +that the content-type start with "text/plain" +--- + +Alternatively, somebody might want to dig into message.el and +understand why it behaves differently in emacs24. I could not +replicate the omission of charset=us-ascii sending a message +interactively. + + test/emacs | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/test/emacs b/test/emacs +index afe35ba..6fab4db 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.*$,Content-Type: XXX,' < 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: XXX + + This is a test that messages are sent via SMTP + EOF +-- +1.7.10.4 + -- 2.26.2