From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id vf0mL6d0IWHuQwAAgWs5BA (envelope-from ) for ; Sat, 21 Aug 2021 23:48:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SENZKqd0IWGSMQAAB5/wlQ (envelope-from ) for ; Sat, 21 Aug 2021 21:48:23 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 696FFC394 for ; Sat, 21 Aug 2021 23:48:23 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 7199A1FCE9; Sat, 21 Aug 2021 17:48:19 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 8B2DA1FA21 for ; Sat, 21 Aug 2021 17:48:16 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id C7DC65FD5C; Sat, 21 Aug 2021 17:48:15 -0400 (EDT) Received: (nullmailer pid 78499 invoked by uid 1000); Sat, 21 Aug 2021 21:48:13 -0000 Resent-To: notmuch@notmuchmail.org Resent-From: David Bremner Resent-Date: Sat, 21 Aug 2021 14:48:13 -0700 Resent-Message-ID: <87h7fibhb6.fsf@tethera.net> Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) by fethera.tethera.net (Postfix) with ESMTPS id 7BB165FD5B for ; Sat, 21 Aug 2021 16:42:03 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id CC7DA1B0011F for ; Sat, 21 Aug 2021 23:41:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1629578519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n7jrwUVD4NJEG/MPpfze5eFsqftbJAi8Qj+m7xad/f8=; b=d635VIyegdiTvp9yD7/mJsS91OR1pHnej+KnxBMCWlbscqzL0ZcgiOizR2TMteQ2Q4ZGu0 kNh9j7sQDLK+h2WCSBnu5cOY5y47BMLA7/UfoarZoWMjC57RFmfDmeAV/C8/8eaQGJ9Y4p SwcqHPKc5Z3U4Iu5OZzx6+kEaKUOIDK3oVwJfuIJkCXXlIB0hPoPYzmx51LnmzUv8OrLg+ js9eaKCcRVYRZ80SSD86+LIk9+4ouAVJPCizZYizrONFRdDMDsQVUpBWRp/Tw8f4nIcjrX G8lf16DFNqYJ4nVac5n8buO2lxoJvi9XoSqTJisvCJw2PTq0gLx1u4D5aVotqg== From: Tomi Ollila To: David Bremner Subject: Re: [PATCH 4/7] test/path-config: use test_expect_equal_file_nonempty In-Reply-To: <20210804104236.3986362-5-david@tethera.net> References: <20210804104236.3986362-1-david@tethera.net> <20210804104236.3986362-5-david@tethera.net> User-Agent: Notmuch/0.32+21~gfdddd4c (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1629578519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=n7jrwUVD4NJEG/MPpfze5eFsqftbJAi8Qj+m7xad/f8=; b=rPpAlDIlbc4PkCNakfxzxh6atLvmhHt2Y4l0qhNcg+SZ16JXZSb8e8ulFyhRHiBWad20cE 4MhyNLGS4fM5lMU84Jx1suYh2DrGesQ7LrKRBH1bMyaucZOjgjLn46zjxIfp8aeqEfRBuS L38mW0QnESE/f4YlBswfLyATf6Myii6dIbxKh46jxmVmlg1BJZ2I2fpByg8ecxsrmjG6bu hgH6kdEg5ArDbLhV1oY6GmeYdb9muAhLGv2PioGTkKET8IV4TVvTOsLC2g/GeTGGFKAkr9 QA3KwlC27aZwiQU7klGoQytrFfsxgiFddhqsBNcwAU7gSajVs8RrMf+SCkhT8g== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1629578519; a=rsa-sha256; cv=none; b=XTnKpcdAMGRCOTeZy1xIPbgyWYWhhoMR5OwrbioIic7ikv2OrwLqLMu7Z4t0QW1+G6XO0t sUN6CqdyTGSvG6/bRaNwTr/ewdVvz4kpxXjRvFEKJpus5VETOyrR8Kb8CdSyEvVdOZzEHC ll8vqNBH1avDjOdsVtBlfxWmety65GACGnAj1grkfQ5dix/6M07Hss+TTeHsq08cpHG8co 3M8vQA6vajvXXHTpTsS/zBbG0wImZLLEc8zxjRNjUu9jox7DvyRs6rAK5+1OCF8qBxxCmG Fl9MFr6qlv0oCAMl3Qy4WxXB/LUdhAOBKooVKT9Nl+tsP5ESuYI8e5wI6G2lqw== Message-ID-Hash: CPNZB76BJUCSTFMCYTVLACUQP67IQUUF X-Message-ID-Hash: CPNZB76BJUCSTFMCYTVLACUQP67IQUUF X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629582503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kGiD4NVuM0hAeqH3Wy4zGWeWhOv2SkINQsLMiTlyQcM=; b=gJT6QFRALlOMDQedAfJepsOpr+Qi3ZomibOqXascOwGpFT84nyOIccacFs0CvVl+9CVeKK CVL8LAhNYOpC5D1z7czw9LbwY7eK7yazqXhpWTIWvsyKlkFVqAgtyz8w2X0IyoiRlRb8RC DUbgMBh/+QoAPYaMfF6n7cVUZsu1zr01jCfNS8yyuHRyh59aCurbBDU2mvvyko+Fn40rZD xGncFgjPa+L0LYA6zUnX8v7soQtGm9HG7jjLiI7KkvzpJsf/muGUCL9NXsbUe/oBvUSf6q 2Q+iorPAbCNrxPoG/+FtGHKKBOiE5wysHPlgAyKXvfuWcZuaBSVsZS7RcAHcZw== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1629582503; a=rsa-sha256; cv=fail; b=iEguesFkI48GAcnu3qyGEMF0JsXq5IzZU3yQLigi6b/KD7TSTMtUQ9Yc4kFIRDVDZHHvL4 r9fIYTZszRZCkItEHDiFsAHYdLgbNsIlst0QtUjHUCo6lNi0plEobjEkZNl0b8s4P2U6+5 emp59cKE9v+Kjd4q6L72+SzWu3ey5yQx9LxjAZyMY3nPo7lN0UVoH3/s7oXSsfHv3MECDa qr5QqJrW38v/u3BeNe+/Jvm30RGUKzjc6CQx2+pUB8Kp79nidtKz4ly4RIxlGpXH490TKK uaV4kkfaVIt0WQnHInI2ZRKUtj1dAZPhaccbj9e4Mav5QeT8CVlU2+MOP0GMnw== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=d635VIye; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 1.07 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=d635VIye; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 696FFC394 X-Spam-Score: 1.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: io+kekhqUpGg On Wed, Aug 04 2021, David Bremner wrote: > This is more robust against crashes when the expected output is also > generated by notmuch. In the case where the expected output is > explicit, it seems like overkill. 1,2,3 and 4 in this series look good to me Tomi (on mobile device) > --- > test/T055-path-config.sh | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh > index bb3bf665..8271579f 100755 > --- a/test/T055-path-config.sh > +++ b/test/T055-path-config.sh > @@ -141,13 +141,13 @@ EOF > notmuch tag -inbox '*' > notmuch restore < EXPECTED > notmuch dump > OUTPUT > - test_expect_equal_file EXPECTED OUTPUT > + test_expect_equal_file_nonempty EXPECTED OUTPUT > > test_begin_subtest "reindex ($config)" > notmuch search --output=messages '*' > EXPECTED > notmuch reindex '*' > notmuch search --output=messages '*' > OUTPUT > - test_expect_equal_file EXPECTED OUTPUT > + test_expect_equal_file_nonempty EXPECTED OUTPUT > > test_begin_subtest "use existing database ($config)" > output=$(notmuch new) > @@ -169,7 +169,7 @@ EOF > test_begin_subtest "Show a raw message ($config)" > add_message > notmuch show --format=raw id:$gen_msg_id > OUTPUT > - test_expect_equal_file $gen_msg_filename OUTPUT > + test_expect_equal_file_nonempty $gen_msg_filename OUTPUT > rm -f $gen_msg_filename > > test_begin_subtest "reply ($config)" > @@ -198,14 +198,13 @@ EOF > mkdir -p "$MAIL_DIR"/{cur,new,tmp} > notmuch insert < "$gen_msg_filename" > cur_msg_filename=$(notmuch search --output=files "subject:insert-subject") > - test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename" > - > + test_expect_equal_file_nonempty "$cur_msg_filename" "$gen_msg_filename" > > test_begin_subtest "compact+search ($config)" > notmuch search --output=messages '*' | sort > EXPECTED > notmuch compact > notmuch search --output=messages '*' | sort > OUTPUT > - test_expect_equal_file EXPECTED OUTPUT > + test_expect_equal_file_nonempty EXPECTED OUTPUT > > test_begin_subtest "upgrade backup ($config)" > features=$(xapian-metadata get $XAPIAN_PATH features | grep -v "^relative directory paths") > -- > 2.30.2 > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org