From 44914f1c3b229ae8aaaa967172a5bd5681e98faf Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 27 Aug 2017 20:58:19 -0300 Subject: [PATCH] test: make fallback to duplicate test more robust. The original intent of this test was to verify that notmuch show was not crashing when the first file (where headers are being read from) was deleted. Run the output through some sanitization so that as we add and delete copies we don't have to update this test. --- test/T670-duplicate-mid.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh index decbc0a4..3495e63d 100755 --- a/test/T670-duplicate-mid.sh +++ b/test/T670-duplicate-mid.sh @@ -39,23 +39,24 @@ test_expect_equal_file EXPECTED OUTPUT rm ${MAIL_DIR}/copy1 test_begin_subtest 'Deleted first duplicate file does not stop notmuch show from working' -output=$(notmuch show --body=false --format=json id:duplicate) +output=$(notmuch show --body=false --format=json id:duplicate | + notmuch_json_show_sanitize | sed 's/message [0-9]/A_SUBJECT/') expected='[[[{ - "id": "'duplicate'", + "id": "XXXXX", "match": true, "excluded": false, "filename": [ "'"${MAIL_DIR}"/copy1'", "'"${MAIL_DIR}"/copy2'" ], - "timestamp": 978709435, + "timestamp": 42, "date_relative": "2001-01-05", "tags": ["inbox","unread"], "headers": { - "Subject": "message 2", + "Subject": "A_SUBJECT", "From": "Notmuch Test Suite ", "To": "Notmuch Test Suite ", - "Date": "Fri, 05 Jan 2001 15:43:55 +0000" + "Date": "GENERATED_DATE" } }, []]]]' -- 2.43.0