aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Bremner <david@tethera.net>2013-12-08 16:39:05 +0800
committerGravatar David Bremner <david@tethera.net>2013-12-09 21:20:15 +0800
commit20f78709faae8fb36c6ebbf81ecfc856a5dcd3c7 (patch)
treee61354883f1a5a575b58fcc29dccd1cee83c6747
parentbb390f89a1599f4767fbf7fc7cb1f01aba22b9ae (diff)
test: pass expected output through json_sanitize in 2 places
This makes the tests more robust against changes in the sanitization rules.
-rwxr-xr-xtest/missing-headers8
-rwxr-xr-xtest/multipart2
2 files changed, 6 insertions, 4 deletions
diff --git a/test/missing-headers b/test/missing-headers
index 43e861bc..cb38301c 100755
--- a/test/missing-headers
+++ b/test/missing-headers
@@ -95,7 +95,7 @@ Body
test_begin_subtest "Show: json"
output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)
-test_expect_equal_json "$output" '
+expected=$(notmuch_json_show_sanitize <<EOF
[
[
[
@@ -156,7 +156,9 @@ test_expect_equal_json "$output" '
[]
]
]
-]'
-
+]
+EOF
+)
+test_expect_equal_json "$output" "$expected"
test_done
diff --git a/test/multipart b/test/multipart
index b40fa2ca..85cbf672 100755
--- a/test/multipart
+++ b/test/multipart
@@ -594,7 +594,7 @@ test_expect_equal_file OUTPUT EXPECTED
test_begin_subtest "'notmuch reply' to a multipart message with json format"
notmuch reply --format=json 'id:87liy5ap00.fsf@yoom.home.cworth.org' | notmuch_json_show_sanitize >OUTPUT
-cat <<EOF >EXPECTED
+notmuch_json_show_sanitize <<EOF >EXPECTED
{"reply-headers": {"Subject": "Re: Multipart message",
"From": "Notmuch Test Suite <test_suite@notmuchmail.org>",
"To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org",