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 08EE16DE009B for ; Sun, 27 Aug 2017 16:58:37 -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 kSOvaWaAGA59 for ; Sun, 27 Aug 2017 16:58:36 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 1C2E96DE00C4 for ; Sun, 27 Aug 2017 16:58:36 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1dm7ON-00052P-3V; Sun, 27 Aug 2017 19:54:59 -0400 Received: (nullmailer pid 27223 invoked by uid 1000); Sun, 27 Aug 2017 23:58:29 -0000 From: David Bremner To: Mark Walters , notmuch@notmuchmail.org Subject: [PATCH 2/5] test/duplicate-mid: clarify index order vs filename order Date: Sun, 27 Aug 2017 20:58:20 -0300 Message-Id: <20170827235823.27177-2-david@tethera.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170827235823.27177-1-david@tethera.net> References: <1503859703-2973-1-git-send-email-markwalters1009@gmail.com> <20170827235823.27177-1-david@tethera.net> 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 23:58:37 -0000 The existing test for notmuch search had the first in filename order the same as the first indexed, which made it harder to understand what the underlying behaviour is. Add a file with a lexicographically smaller name, but later index time to clarify this. --- test/T670-duplicate-mid.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/T670-duplicate-mid.sh b/test/T670-duplicate-mid.sh index 3495e63d..d2f89432 100755 --- a/test/T670-duplicate-mid.sh +++ b/test/T670-duplicate-mid.sh @@ -5,15 +5,17 @@ test_description="duplicate message ids" add_message '[id]="duplicate"' '[subject]="message 1" [filename]=copy1' add_message '[id]="duplicate"' '[subject]="message 2" [filename]=copy2' -test_begin_subtest 'First subject preserved' +add_message '[id]="duplicate"' '[subject]="message 0" [filename]=copy0' +test_begin_subtest 'search: first indexed subject preserved' cat < EXPECTED -thread:XXX 2001-01-05 [1/1(2)] Notmuch Test Suite; message 1 (inbox unread) +thread:XXX 2001-01-05 [1/1(3)] Notmuch Test Suite; message 1 (inbox unread) EOF notmuch search id:duplicate | notmuch_search_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT test_begin_subtest 'Search for second subject' cat <EXPECTED +MAIL_DIR/copy0 MAIL_DIR/copy1 MAIL_DIR/copy2 EOF @@ -23,6 +25,7 @@ test_expect_equal_file EXPECTED OUTPUT add_message '[id]="duplicate"' '[body]="sekrit" [filename]=copy3' test_begin_subtest 'search for body in duplicate file' cat <EXPECTED +MAIL_DIR/copy0 MAIL_DIR/copy1 MAIL_DIR/copy2 MAIL_DIR/copy3 @@ -37,7 +40,7 @@ notmuch reindex '*' notmuch search --output=files "sekrit" | notmuch_dir_sanitize > OUTPUT test_expect_equal_file EXPECTED OUTPUT -rm ${MAIL_DIR}/copy1 +rm ${MAIL_DIR}/copy0 test_begin_subtest 'Deleted first duplicate file does not stop notmuch show from working' output=$(notmuch show --body=false --format=json id:duplicate | notmuch_json_show_sanitize | sed 's/message [0-9]/A_SUBJECT/') @@ -46,6 +49,7 @@ expected='[[[{ "match": true, "excluded": false, "filename": [ + "'"${MAIL_DIR}"/copy0'", "'"${MAIL_DIR}"/copy1'", "'"${MAIL_DIR}"/copy2'" ], -- 2.13.2