From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
Date: Sat, 28 May 2011 22:03:48 +0000 (+0400)
Subject: test: fix tests after notmuch show output changes related to filenames
X-Git-Tag: 0.7_rc1~38
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f74c4bc2f3ceedc6b6f3501c552df6c77fce9c00;p=notmuch.git

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 7eb35591..b49a4e05 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 2da9afa6..4d577f81 100755
--- a/test/multipart
+++ b/test/multipart
@@ -110,8 +110,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000
 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
@@ -148,8 +147,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000
 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
@@ -176,8 +174,7 @@ cat <<EOF >EXPECTED
 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
@@ -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
-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}
 EOF