From: David Bremner Date: Thu, 30 Aug 2012 01:09:54 +0000 (-0300) Subject: test: canonicalize content-type in "Sending a message via (fake) SMTP" X-Git-Tag: 0.15_rc1~261 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=e01706c99375f3e3f121cf372a45a752874fd38a;hp=3c053bf81cf75ab37b906e748ea1edcf8af4b178 test: canonicalize content-type in "Sending a message via (fake) SMTP" 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. --- diff --git a/test/emacs b/test/emacs index afe35bae..5d118b67 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