mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-31 22:01:47 +01:00
test: some small fixes to multipart test
There were two "--format=text --part=0" tests. One of them was supposed to be a test for "--format=text --part=1". There were also two errant "test_expect_equal_file OUTPUT EXPECTED" lines, that are removed here.
This commit is contained in:
parent
b71405c9a4
commit
ea3a26f590
1 changed files with 2 additions and 15 deletions
|
@ -127,18 +127,9 @@ Non-text part: application/pgp-signature
|
|||
EOF
|
||||
test_expect_equal_file OUTPUT EXPECTED
|
||||
|
||||
test_begin_subtest "--format=text --part=0, full message"
|
||||
notmuch show --format=text --part=0 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
|
||||
test_begin_subtest "--format=text --part=1, message body"
|
||||
notmuch show --format=text --part=1 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
|
||||
cat <<EOF >EXPECTED
|
||||
message{ id:87liy5ap00.fsf@yoom.home.cworth.org depth:0 match:1 filename:${MAIL_DIR}/multipart
|
||||
header{
|
||||
Carl Worth <cworth@cworth.org> (2001-01-05) (attachment inbox signed unread)
|
||||
Subject: Multipart message
|
||||
From: Carl Worth <cworth@cworth.org>
|
||||
To: cworth@cworth.org
|
||||
Date: Tue, 05 Jan 2001 15:43:57 -0000
|
||||
header}
|
||||
body{
|
||||
part{ ID: 1, Content-type: multipart/signed
|
||||
part{ ID: 2, Content-type: multipart/mixed
|
||||
part{ ID: 3, Content-type: message/rfc822
|
||||
|
@ -159,8 +150,6 @@ And this message is signed.
|
|||
Non-text part: application/pgp-signature
|
||||
part}
|
||||
part}
|
||||
body}
|
||||
message}
|
||||
EOF
|
||||
test_expect_equal_file OUTPUT EXPECTED
|
||||
|
||||
|
@ -252,13 +241,11 @@ test_begin_subtest "--format=json --part=2, multipart/mixed"
|
|||
output=$(notmuch show --format=json --part=2 'id:87liy5ap00.fsf@yoom.home.cworth.org')
|
||||
test_expect_equal "$output" \
|
||||
'{"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"}]}'
|
||||
test_expect_equal_file OUTPUT EXPECTED
|
||||
|
||||
test_begin_subtest "--format=json --part=3, rfc822 multipart"
|
||||
output=$(notmuch show --format=json --part=3 'id:87liy5ap00.fsf@yoom.home.cworth.org')
|
||||
test_expect_equal "$output" \
|
||||
'{"id": 3, "content-type": "message/rfc822", "content": [{"id": 4, "content-type": "text/html"}]}'
|
||||
test_expect_equal_file OUTPUT EXPECTED
|
||||
|
||||
test_begin_subtest "--format=json --part=4, html part"
|
||||
output=$(notmuch show --format=json --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org')
|
||||
|
|
Loading…
Reference in a new issue