This makes the tests more robust against changes in the sanitization rules. --- test/missing-headers | 8 +++++--- test/multipart | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/missing-headers b/test/missing-headers index 43e861b..cb38301 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 b40fa2c..73f8fdd 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 +cat <<EOF | notmuch_json_show_sanitize >EXPECTED {"reply-headers": {"Subject": "Re: Multipart message", "From": "Notmuch Test Suite <test_suite@notmuchmail.org>", "To": "Carl Worth <cworth@cworth.org>, cworth@cworth.org", -- 1.8.4.3