From 64e30aeb245631e3e30091e426fd45bfc2dcb448 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 27 Aug 2017 20:58:23 -0300 Subject: [PATCH] test/duplicate-mid: check for subject with notmuch-show In [1] Mark showed that the the current code (d7a49e81) is not consistent in it's handling of subjects of messages with duplicate message-ids (or in notmuch-speak, of messages with multiple files). notmuch-search uses indexing order and explicitedly preserves the first. notmuch-show (apparently) uses alphabetical (or at least xapian term order) of filenames. In a perfect world we would probably report all subjects in the json output; at the very least we should be consistent. [1]: id:87378dny3d.fsf@qmul.ac.uk --- test/T670-duplicate-mid.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh index ce010cf7..21a9689a 100755 --- a/test/T670-duplicate-mid.sh +++ b/test/T670-duplicate-mid.sh @@ -13,6 +13,31 @@ EOF notmuch search id:duplicate | notmuch_search_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT +test_begin_subtest 'First subject preserved in notmuch-show (json)' +test_subtest_known_broken +output=$(notmuch show --body=false --format=json id:duplicate | notmuch_json_show_sanitize) +expected='[[[{ + "id": "XXXXX", + "match": true, + "excluded": false, + "filename": [ + "'"${MAIL_DIR}"/copy0'", + "'"${MAIL_DIR}"/copy1'", + "'"${MAIL_DIR}"/copy2'" + ], + "timestamp": 42, + "date_relative": "2001-01-05", + "tags": ["inbox","unread"], + "headers": { + "Subject": "message 1", + "From": "Notmuch Test Suite ", + "To": "Notmuch Test Suite ", + "Date": "GENERATED_DATE" + } + }, +[]]]]' +test_expect_equal_json "$output" "$expected" + test_begin_subtest 'Search for second subject' cat <EXPECTED MAIL_DIR/copy0