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 EB4121F9F3; Mon, 27 Sep 2021 21:05:45 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Cc: Konstantin Ryabitsev Subject: [PATCH 2/3] t/lei-index: IMAP and NNTP dependencies are optional Date: Mon, 27 Sep 2021 16:05:44 -0500 Message-Id: <20210927210545.23941-3-e@80x24.org> In-Reply-To: <20210927210545.23941-1-e@80x24.org> References: <20210927210545.23941-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: "lei index" support for IMAP and NNTP is incomplete, so there's no point in requiring them. Reported-by: Konstantin Ryabitsev Link: https://public-inbox.org/meta/20210927124056.kj5okiefvs4ztk27@meerkat.local/ --- t/lei-index.t | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/t/lei-index.t b/t/lei-index.t index eeda5196f411..aab8f7e63f06 100644 --- a/t/lei-index.t +++ b/t/lei-index.t @@ -3,21 +3,30 @@ # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; use File::Spec; -require_mods(qw(lei -nntpd)); +require_mods(qw(lei)); my ($ro_home, $cfg_path) = setup_public_inboxes; my ($tmpdir, $for_destroy) = tmpdir; my $env = { PI_CONFIG => $cfg_path }; +my $srv = {}; -my $sock = tcp_server; -my $cmd = [ '-nntpd', '-W0', "--stdout=$tmpdir/n1", "--stderr=$tmpdir/n2" ]; -my $nntpd = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT("-nntpd $?"); -my $nntp_host_port = tcp_host_port($sock); +SKIP: { + require_mods(qw(-nntpd Net::NNTP), 1); + my $rdr = { 3 => tcp_server }; + $srv->{nntpd} = start_script( + [qw(-nntpd -W0), "--stdout=$tmpdir/n1", "--stderr=$tmpdir/n2"], + $env, $rdr) or xbail "nntpd: $?"; + $srv->{nntp_host_port} = tcp_host_port($rdr->{3}); +} + +SKIP: { + require_mods(qw(-imapd Mail::IMAPClient), 1); + my $rdr = { 3 => tcp_server }; + $srv->{imapd} = start_script( + [qw(-imapd -W0), "--stdout=$tmpdir/i1", "--stderr=$tmpdir/i2"], + $env, $rdr) or xbail("-imapd $?"); + $srv->{imap_host_port} = tcp_host_port($rdr->{3}); +} -$sock = tcp_server; -$cmd = [ '-imapd', '-W0', "--stdout=$tmpdir/i1", "--stderr=$tmpdir/i2" ]; -my $imapd = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT("-imapd $?"); -my $imap_host_port = tcp_host_port($sock); -undef $sock; for ('', qw(cur new)) { mkdir "$tmpdir/md/$_" or xbail "mkdir: $!"; mkdir "$tmpdir/md1/$_" or xbail "mkdir: $!"; @@ -77,8 +86,10 @@ test_lei({ tmpdir => $tmpdir }, sub { is_deeply(json_utf8->decode($lei_out)->[0]->{'kw'}, ['seen'], 'keyword set'); - lei_ok('index', "nntp://$nntp_host_port/t.v2"); - lei_ok('index', "imap://$imap_host_port/t.v2.0"); + $srv->{nntpd} and + lei_ok('index', "nntp://$srv->{nntp_host_port}/t.v2"); + $srv->{imapd} and + lei_ok('index', "imap://$srv->{imap_host_port}/t.v2.0"); is_deeply([xqx($all_obj)], \@objs, 'no new objects from NNTP+IMAP'); lei_ok qw(q m:multipart-html-sucks@11);