aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/emacs
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2012-08-29 22:09:54 -0300
committerGravatar David Bremner <bremner@debian.org>2012-08-30 20:19:36 -0300
commite01706c99375f3e3f121cf372a45a752874fd38a (patch)
tree17e4794e12e883660d5ed8f80c1dc6c6a8528582 /test/emacs
parent3c053bf81cf75ab37b906e748ea1edcf8af4b178 (diff)
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.
Diffstat (limited to 'test/emacs')
-rwxr-xr-xtest/emacs5
1 files changed, 3 insertions, 2 deletions
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: <XXX>,' < sent_message >OUTPUT
+ -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \
+ -e s',^\(Content-Type: text/plain\); charset=us-ascii$,\1,' < sent_message >OUTPUT
cat <<EOF >EXPECTED
From: Notmuch Test Suite <test_suite@notmuchmail.org>
To: user@example.com
@@ -178,7 +179,7 @@ Date: 01 Jan 2000 12:00:00 -0000
User-Agent: Notmuch/XXX Emacs/XXX
Message-ID: <XXX>
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