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 812936DE00D2 for ; Sun, 27 Aug 2017 16:58:36 -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 sZQ_-ucKLiaS 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 9733F6DE009B for ; Sun, 27 Aug 2017 16:58:34 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1dm7OI-00051O-9W; Sun, 27 Aug 2017 19:54:54 -0400 Received: (nullmailer pid 27220 invoked by uid 1000); Sun, 27 Aug 2017 23:58:28 -0000 From: David Bremner To: Mark Walters , notmuch@notmuchmail.org Subject: [PATCH 1/5] test: make fallback to duplicate test more robust. Date: Sun, 27 Aug 2017 20:58:19 -0300 Message-Id: <20170827235823.27177-1-david@tethera.net> X-Mailer: git-send-email 2.13.2 In-Reply-To: <1503859703-2973-1-git-send-email-markwalters1009@gmail.com> References: <1503859703-2973-1-git-send-email-markwalters1009@gmail.com> 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:36 -0000 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.13.2