* [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP"
@ 2012-08-30 1:12 david
2012-08-30 1:36 ` Austin Clements
0 siblings, 1 reply; 6+ messages in thread
From: david @ 2012-08-30 1:12 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
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: <XXX>,' < sent_message >OUTPUT
+ -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \
+ -e s',^Content-Type: text/plain.*$,Content-Type: XXX,' < 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: XXX
This is a test that messages are sent via SMTP
EOF
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP"
2012-08-30 1:12 [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP" david
@ 2012-08-30 1:36 ` Austin Clements
2012-08-30 23:24 ` david
0 siblings, 1 reply; 6+ messages in thread
From: Austin Clements @ 2012-08-30 1:36 UTC (permalink / raw)
To: david; +Cc: notmuch, David Bremner
Quoth david@tethera.net on Aug 29 at 10:12 pm:
> From: David Bremner <bremner@debian.org>
>
> 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: <XXX>,' < sent_message >OUTPUT
> + -e s',^Message-ID: <.*>$,Message-ID: <XXX>,' \
> + -e s',^Content-Type: text/plain.*$,Content-Type: XXX,' < sent_message >OUTPUT
Maybe something more exact? Since us-ascii is the default charset and
equivalent to not specifying a charset (which is presumably related to
the change in Emacs 24), how about
s',^\(Content-Type: text/plain\); charset=us-ascii\b,\1,'
? That would canonicalize away only the default-valued part.
> 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: XXX
>
> This is a test that messages are sent via SMTP
> EOF
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP"
2012-08-30 1:36 ` Austin Clements
@ 2012-08-30 23:24 ` david
2012-08-31 3:49 ` Austin Clements
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: david @ 2012-08-30 23:24 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner
From: David Bremner <bremner@debian.org>
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: <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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP"
2012-08-30 23:24 ` david
@ 2012-08-31 3:49 ` Austin Clements
2012-08-31 7:14 ` Tomi Ollila
2012-08-31 11:48 ` David Bremner
2 siblings, 0 replies; 6+ messages in thread
From: Austin Clements @ 2012-08-31 3:49 UTC (permalink / raw)
To: david; +Cc: notmuch, David Bremner
LGTM.
Quoth david@tethera.net on Aug 30 at 8:24 pm:
> From: David Bremner <bremner@debian.org>
>
> 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: <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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP"
2012-08-30 23:24 ` david
2012-08-31 3:49 ` Austin Clements
@ 2012-08-31 7:14 ` Tomi Ollila
2012-08-31 11:48 ` David Bremner
2 siblings, 0 replies; 6+ messages in thread
From: Tomi Ollila @ 2012-08-31 7:14 UTC (permalink / raw)
To: david, notmuch; +Cc: David Bremner
On Fri, Aug 31 2012, david@tethera.net wrote:
> From: David Bremner <bremner@debian.org>
>
> 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.
> ---
LGTM.
Tomi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP"
2012-08-30 23:24 ` david
2012-08-31 3:49 ` Austin Clements
2012-08-31 7:14 ` Tomi Ollila
@ 2012-08-31 11:48 ` David Bremner
2 siblings, 0 replies; 6+ messages in thread
From: David Bremner @ 2012-08-31 11:48 UTC (permalink / raw)
To: notmuch
david@tethera.net writes:
> From: David Bremner <bremner@debian.org>
>
> 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.
Pushed the second one.
d
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-08-31 11:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-30 1:12 [PATCH] test: canonicalize content-type in "Sending a message via (fake) SMTP" david
2012-08-30 1:36 ` Austin Clements
2012-08-30 23:24 ` david
2012-08-31 3:49 ` Austin Clements
2012-08-31 7:14 ` Tomi Ollila
2012-08-31 11:48 ` David Bremner
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).