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 286B91F8C8 for ; Sun, 12 Sep 2021 08:42:20 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/3] t/lei-*.t: guard setup_public_inboxes with test_lei Date: Sun, 12 Sep 2021 08:42:17 +0000 Message-Id: <20210912084219.11609-2-e@80x24.org> In-Reply-To: <20210912084219.11609-1-e@80x24.org> References: <20210912084219.11609-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This ensures tests are skipped properly if SQLite or Xapian are missing and don't bail out. --- t/lei-auto-watch.t | 3 +-- t/lei-up.t | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/t/lei-auto-watch.t b/t/lei-auto-watch.t index 3b0c1b10..e5e132eb 100644 --- a/t/lei-auto-watch.t +++ b/t/lei-auto-watch.t @@ -3,14 +3,13 @@ # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; use File::Basename qw(basename); -my ($ro_home, $cfg_path) = setup_public_inboxes; my $have_fast_inotify = eval { require Linux::Inotify2 } || eval { require IO::KQueue }; - $have_fast_inotify or diag("$0 IO::KQueue or Linux::Inotify2 missing, test will be slow"); test_lei(sub { + my ($ro_home, $cfg_path) = setup_public_inboxes; my $x = "$ENV{HOME}/x"; my $y = "$ENV{HOME}/y"; lei_ok qw(add-external), "$ro_home/t1"; diff --git a/t/lei-up.t b/t/lei-up.t index c6f31c74..6b34774d 100644 --- a/t/lei-up.t +++ b/t/lei-up.t @@ -2,9 +2,9 @@ # Copyright all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; -my ($ro_home, $cfg_path) = setup_public_inboxes; use IO::Uncompress::Gunzip qw(gunzip $GunzipError); test_lei(sub { + my ($ro_home, $cfg_path) = setup_public_inboxes; my $s = eml_load('t/plack-qp.eml')->as_string; lei_ok [qw(import -q -F eml -)], undef, { 0 => \$s, %$lei_opt }; lei_ok qw(q z:0.. -f mboxcl2 -o), "$ENV{HOME}/a.mbox.gz";