test: Fix date in test message in multipart test.

The test message date, "Tue, 05 Jan 2001 15:43:57 -0000", is not
actually a real date.  05 Jan 2001 was in fact a Friday, not a
Tuesday.  Date parsers (such as "date" in coreutils) will return "Fri"
as the day for this string, even if "Tue" is specified.

Also, the time zone "-0000" is actually always returned as "+0000", so
we change that here was well.

This will be relevant for later patches when we begin parsing rfc822
part headers, where gmime returns a parsed date string.

If we do want to test date parsing, we should do that in a separate
test.
This commit is contained in:
Jameson Graef Rollins 2011-06-05 17:29:26 -07:00 committed by David Bremner
parent ea3a26f590
commit ec2b0a98cc

View file

@ -6,7 +6,7 @@ cat <<EOF > ${MAIL_DIR}/multipart
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Subject: Multipart message Subject: Multipart message
Date: Tue, 05 Jan 2001 15:43:57 -0000 Date: Fri, 05 Jan 2001 15:43:57 +0000
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)
Message-ID: <87liy5ap00.fsf@yoom.home.cworth.org> Message-ID: <87liy5ap00.fsf@yoom.home.cworth.org>
MIME-Version: 1.0 MIME-Version: 1.0
@ -23,7 +23,7 @@ Content-Disposition: inline
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Subject: html message Subject: html message
Date: Tue, 05 Jan 2001 15:42:57 -0000 Date: Fri, 05 Jan 2001 15:42:57 +0000
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)
Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org> Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org>
MIME-Version: 1.0 MIME-Version: 1.0
@ -61,7 +61,7 @@ cat <<EOF > ${MAIL_DIR}/base64-part-with-crlf
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Subject: Test message with a BASE64 encoded binary containing CRLF pair Subject: Test message with a BASE64 encoded binary containing CRLF pair
Date: Tue, 05 Jan 2001 15:43:57 -0000 Date: Fri, 05 Jan 2001 15:43:57 +0000
User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu)
Message-ID: <base64-part-with-crlf> Message-ID: <base64-part-with-crlf>
MIME-Version: 1.0 MIME-Version: 1.0
@ -99,7 +99,7 @@ Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)
Subject: Multipart message Subject: Multipart message
From: Carl Worth <cworth@cworth.org> From: Carl Worth <cworth@cworth.org>
To: cworth@cworth.org To: cworth@cworth.org
Date: Tue, 05 Jan 2001 15:43:57 -0000 Date: Fri, 05 Jan 2001 15:43:57 +0000
header} header}
body{ body{
part{ ID: 1, Content-type: multipart/signed part{ ID: 1, Content-type: multipart/signed
@ -230,7 +230,7 @@ test_expect_success \
test_begin_subtest "--format=json --part=0, full message" test_begin_subtest "--format=json --part=0, full message"
output=$(notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org')
test_expect_equal "$output" \ test_expect_equal "$output" \
'{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "'"${MAIL_DIR}/multipart"'", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Tue, 05 Jan 2001 15:43:57 -0000"}, "body": [{"id": 1, "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 7, "content-type": "application/pgp-signature"}]}]}' '{"id": "87liy5ap00.fsf@yoom.home.cworth.org", "match": true, "filename": "'"${MAIL_DIR}/multipart"'", "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["attachment","inbox","signed","unread"], "headers": {"Subject": "Multipart message", "From": "Carl Worth <cworth@cworth.org>", "To": "cworth@cworth.org", "Cc": "", "Bcc": "", "Date": "Fri, 05 Jan 2001 15:43:57 +0000"}, "body": [{"id": 1, "content-type": "multipart/signed", "content": [{"id": 2, "content-type": "multipart/mixed", "content": [{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}, {"id": 5, "content-type": "text/plain", "filename": "attachment", "content": "This is a text attachment.\n"}, {"id": 6, "content-type": "text/plain", "content": "And this message is signed.\n\n-Carl\n"}]}, {"id": 7, "content-type": "application/pgp-signature"}]}]}'
test_begin_subtest "--format=json --part=1, message body" test_begin_subtest "--format=json --part=1, message body"
output=$(notmuch show --format=json --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org') output=$(notmuch show --format=json --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org')
@ -380,7 +380,7 @@ To: Carl Worth <cworth@cworth.org>, cworth@cworth.org
In-Reply-To: <87liy5ap00.fsf@yoom.home.cworth.org> In-Reply-To: <87liy5ap00.fsf@yoom.home.cworth.org>
References: <87liy5ap00.fsf@yoom.home.cworth.org> References: <87liy5ap00.fsf@yoom.home.cworth.org>
On Tue, 05 Jan 2001 15:43:57 -0000, Carl Worth <cworth@cworth.org> wrote: On Fri, 05 Jan 2001 15:43:57 +0000, Carl Worth <cworth@cworth.org> wrote:
Non-text part: multipart/signed Non-text part: multipart/signed
Non-text part: multipart/mixed Non-text part: multipart/mixed
Non-text part: message/rfc822 Non-text part: message/rfc822