test: fix tests after notmuch show output changes related to filenames

Adding the filename propery alongside ID and Content-type.

This makes the test suite pass again after the recent change.

diff --git a/test/crypto b/test/crypto
index 7eb3559169ffafbfe7b29c087a48c9cc82a6109f..b49a4e0560177385a1025de93356a113faf80436 100755 (executable)
--- a/test/crypto
+++ b/test/crypto
@@ -168,8 +168,7 @@ Non-text part: application/pgp-encrypted
 \fpart{ ID: 4, Content-type: text/plain
 This is a test encrypted message.
 \fpart}
-\fattachment{ ID: 5, Content-type: application/octet-stream
-Attachment: TESTATTACHMENT (application/octet-stream)
+\fattachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream
 Non-text part: application/octet-stream
 \fattachment}
 \fpart}

diff --git a/test/multipart b/test/multipart
index 2da9afa6dbf7f953700cc94cc5e08aeaecab42b1..4d577f815991d0b1556a131336a4c1727be50f27 100755 (executable)
--- a/test/multipart
+++ b/test/multipart
@@ -110,8 +110,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000
 Non-text part: text/html
 \fpart}
 \fpart}
-\fattachment{ ID: 5, Content-type: text/plain
-Attachment: attachment (text/plain)
+\fattachment{ ID: 5, Filename: attachment, Content-type: text/plain
 This is a text attachment.
 \fattachment}
 \fpart{ ID: 6, Content-type: text/plain
@@ -148,8 +147,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000
 Non-text part: text/html
 \fpart}
 \fpart}
-\fattachment{ ID: 5, Content-type: text/plain
-Attachment: attachment (text/plain)
+\fattachment{ ID: 5, Filename: attachment, Content-type: text/plain
 This is a text attachment.
 \fattachment}
 \fpart{ ID: 6, Content-type: text/plain
@@ -176,8 +174,7 @@ cat <<EOF >EXPECTED
 Non-text part: text/html
 \fpart}
 \fpart}
-\fattachment{ ID: 5, Content-type: text/plain
-Attachment: attachment (text/plain)
+\fattachment{ ID: 5, Filename: attachment, Content-type: text/plain
 This is a text attachment.
 \fattachment}
 \fpart{ ID: 6, Content-type: text/plain
@@ -212,8 +209,7 @@ test_expect_equal_file OUTPUT EXPECTED
 test_begin_subtest "--format=text --part=5, inline attachment"
 notmuch show --format=text --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT
 cat <<EOF >EXPECTED
-\fattachment{ ID: 5, Content-type: text/plain
-Attachment: attachment (text/plain)
+\fattachment{ ID: 5, Filename: attachment, Content-type: text/plain
 This is a text attachment.
 \fattachment}
 EOF