From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 8BE426DE0352 for ; Sun, 27 Aug 2017 06:19:28 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.011, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uIl8ATrxkTZv for ; Sun, 27 Aug 2017 06:19:27 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 272D36DE0350 for ; Sun, 27 Aug 2017 06:19:27 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1dlxPo-0004N5-JA; Sun, 27 Aug 2017 09:15:48 -0400 Received: (nullmailer pid 12534 invoked by uid 1000); Sun, 27 Aug 2017 13:19:22 -0000 From: David Bremner To: Mark Walters , notmuch@notmuchmail.org Subject: [PATCH] test: check for subject consistency between search and show Date: Sun, 27 Aug 2017 10:19:14 -0300 Message-Id: <20170827131914.12489-1-david@tethera.net> X-Mailer: git-send-email 2.14.1 In-Reply-To: <87378dny3d.fsf@qmul.ac.uk> References: <87378dny3d.fsf@qmul.ac.uk> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Aug 2017 13:19:28 -0000 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 | 62 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh index decbc0a4..55ebde38 100755 --- a/test/T670-duplicate-mid.sh +++ b/test/T670-duplicate-mid.sh @@ -12,6 +12,29 @@ 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)' +output=$(notmuch show --body=false --format=json id:duplicate | notmuch_json_show_sanitize) +expected='[[[{ + "id": "XXXXX", + "match": true, + "excluded": false, + "filename": [ + "'"${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/copy1 @@ -37,25 +60,52 @@ notmuch reindex '*' notmuch search --output=files "sekrit" | notmuch_dir_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT -rm ${MAIL_DIR}/copy1 +add_message '[id]="duplicate"' '[subject]="reorder file names"' '[filename]=00-copy4' +test_begin_subtest 'First subject preserved in notmuch-show (json), file order' +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}"/00-copy4'", + "'"${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" + +rm ${MAIL_DIR}/00-copy4 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) expected='[[[{ - "id": "'duplicate'", + "id": "XXXXX", "match": true, "excluded": false, "filename": [ + "'"${MAIL_DIR}"/00-copy4'", "'"${MAIL_DIR}"/copy1'", "'"${MAIL_DIR}"/copy2'" ], - "timestamp": 978709435, + "timestamp": 42, "date_relative": "2001-01-05", "tags": ["inbox","unread"], "headers": { - "Subject": "message 2", + "Subject": "message 1", "From": "Notmuch Test Suite ", "To": "Notmuch Test Suite ", - "Date": "Fri, 05 Jan 2001 15:43:55 +0000" + "Date": "GENERATED_DATE" } }, []]]]' -- 2.14.1