From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4F0C81F9F4; Mon, 22 Nov 2021 07:42:41 +0000 (UTC) Date: Mon, 22 Nov 2021 07:42:41 +0000 From: Eric Wong To: =?utf-8?B?SsO2cmcgUsO2ZGVs?= Cc: meta@public-inbox.org Subject: [PATCH] t/lei-mirror: skip lei comparisons if lei missing Message-ID: <20211122074241.M224754@dcvr> References: <20211119185411.M766819@dcvr> <20211122065545.GA31379@dcvr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211122065545.GA31379@dcvr> List-Id: Eric Wong wrote: > Will work on a patch to ensure lei ran successfully. ---------8<-------- Subject: [PATCH] t/lei-mirror: skip lei comparisons if lei missing We can't compare created_at times with lei if lei tests are skipped due to Inline::C or Socket::MsgHdr unavailability. Reported-by: Jörg Rödel Link: https://public-inbox.org/meta/YZebmAxlFJy4lqAw@8bytes.org/ --- t/lei-mirror.t | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/t/lei-mirror.t b/t/lei-mirror.t index 646ff2b19f98..d6fa6db5e3cb 100644 --- a/t/lei-mirror.t +++ b/t/lei-mirror.t @@ -170,12 +170,17 @@ SKIP: { local $ENV{HOME} = $tmpdir; ok(run_script([qw(-index -Lbasic), "$d/t1"]), 'index v1'); ok(run_script([qw(-index -Lbasic), "$d/t2"]), 'index v2'); - my $f = "$d/t1/public-inbox/msgmap.sqlite3"; - my $ca = PublicInbox::Msgmap->new_file($f)->created_at; - is($ca, $created{v1}, 'clone + index v1 synced ->created_at'); - $f = "$d/t2/msgmap.sqlite3"; - $ca = PublicInbox::Msgmap->new_file($f)->created_at; - is($ca, $created{v2}, 'clone + index v1 synced ->created_at'); + + SKIP: { + skip "lei didn't run", 2 if join(sort keys %created) ne 'v1v2'; + my $f = "$d/t1/public-inbox/msgmap.sqlite3"; + my $ca = PublicInbox::Msgmap->new_file($f)->created_at; + is($ca, $created{v1}, 'clone + index v1 synced ->created_at'); + + $f = "$d/t2/msgmap.sqlite3"; + $ca = PublicInbox::Msgmap->new_file($f)->created_at; + is($ca, $created{v2}, 'clone + index v2 synced ->created_at'); + } test_lei(sub { lei_ok qw(inspect num:1 --dir), "$d/t1"; ok(ref(json_utf8->decode($lei_out)), 'inspect num: on v1');