[PATCH 2/2] test: fix tests after notmuch show output changes related to filenames
--- test/crypto|3 +-- test/multipart | 12 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/test/crypto b/test/crypto index 8e92016..796c4ca 100755 --- a/test/crypto +++ b/test/crypto @@ -168,8 +168,7 @@ Non-text part: application/pgp-encrypted part{ ID: 4, Content-type: text/plain This is a test encrypted message. part} -attachment{ ID: 5, Content-type: application/octet-stream -Attachment: TESTATTACHMENT (application/octet-stream) +attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream Non-text part: application/octet-stream attachment} part} diff --git a/test/multipart b/test/multipart index 62efd84..9348fb6 100755 --- a/test/multipart +++ b/test/multipart @@ -77,8 +77,7 @@ Date: Tue, 05 Jan 2001 15:43:57 - Non-text part: text/html part} part} -attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment} part{ ID: 6, Content-type: text/plain @@ -104,8 +103,7 @@ test_expect_equal "$output" \ Non-text part: text/html part} part} -attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment} part{ ID: 6, Content-type: text/plain @@ -128,8 +126,7 @@ test_expect_equal "$output" \ Non-text part: text/html part} part} -attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment} part{ ID: 6, Content-type: text/plain @@ -158,8 +155,7 @@ Non-text part: text/html test_begin_subtest "--format=text --part=5, inline attachement" output=$(notmuch show --format=text --part=5 'id:87liy5ap00.fsf at yoom.home.cworth.org') test_expect_equal "$output" \ -"attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +"attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment}" -- 1.7.5.3
[PATCH 2/2] test: fix tests after notmuch show output changes related to filenames
--- test/crypto|3 +-- test/multipart | 12 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/test/crypto b/test/crypto index 8e92016..796c4ca 100755 --- a/test/crypto +++ b/test/crypto @@ -168,8 +168,7 @@ Non-text part: application/pgp-encrypted part{ ID: 4, Content-type: text/plain This is a test encrypted message. part} -attachment{ ID: 5, Content-type: application/octet-stream -Attachment: TESTATTACHMENT (application/octet-stream) +attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream Non-text part: application/octet-stream attachment} part} diff --git a/test/multipart b/test/multipart index 62efd84..9348fb6 100755 --- a/test/multipart +++ b/test/multipart @@ -77,8 +77,7 @@ Date: Tue, 05 Jan 2001 15:43:57 - Non-text part: text/html part} part} -attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment} part{ ID: 6, Content-type: text/plain @@ -104,8 +103,7 @@ test_expect_equal "$output" \ Non-text part: text/html part} part} -attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment} part{ ID: 6, Content-type: text/plain @@ -128,8 +126,7 @@ test_expect_equal "$output" \ Non-text part: text/html part} part} -attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment} part{ ID: 6, Content-type: text/plain @@ -158,8 +155,7 @@ Non-text part: text/html test_begin_subtest "--format=text --part=5, inline attachement" output=$(notmuch show --format=text --part=5 'id:87liy5ap00@yoom.home.cworth.org') test_expect_equal "$output" \ -"attachment{ ID: 5, Content-type: text/plain -Attachment: attachment (text/plain) +"attachment{ ID: 5, Filename: attachment, Content-type: text/plain This is a text attachment. attachment}" -- 1.7.5.3 ___ notmuch mailing list notmuch@notmuchmail.org http://notmuchmail.org/mailman/listinfo/notmuch