lib/PublicInbox/TestCommon.pm | 23 ++++++++++++++++------- t/altid_v2.t | 2 +- t/imap.t | 5 ++--- t/imap_searchqp.t | 5 ++--- t/imapd-tls.t | 3 +-- t/imapd.t | 3 +-- t/init.t | 2 +- t/lei-convert.t | 3 +-- t/lei-import-imap.t | 3 +-- t/lei-mirror.t | 3 +-- t/lei-q-remote-import.t | 3 +-- t/net_reader-imap.t | 2 +- xt/imapd-mbsync-oimap.t | 4 ++-- xt/imapd-validate.t | 4 ++-- xt/mem-imapd-tls.t | 5 ++--- diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 72617a78efb3ae6c8e490b38e820da422e362e19..d36a63aa29aaa310c4b647db0e22150b1a3bfaa4 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -107,19 +107,28 @@ my @mods = @_; my $maybe = pop @mods if $mods[-1] =~ /\A[0-9]+\z/; my @need; while (my $mod = shift(@mods)) { + if ($mod eq 'lei') { + require_git(2.6, $maybe ? $maybe : ()); + push @mods, qw(DBD::SQLite Search::Xapian); + $mod = 'json'; # fall-through + } if ($mod eq 'json') { - $mod = 'Cpanel::JSON::XS||JSON::MaybeXS||'. - 'JSON||JSON::PP' + $mod = 'Cpanel::JSON::XS||JSON::MaybeXS||JSON||JSON::PP' + } elsif ($mod eq '-httpd') { + push @mods, qw(Plack::Builder Plack::Util); + next; + } elsif ($mod eq '-imapd') { + push @mods, qw(Parse::RecDescent DBD::SQLite + Email::Address::XS||Mail::Address); + next; + } elsif ($mod eq '-nntpd') { + push @mods, qw(DBD::SQLite); + next; } if ($mod eq 'Search::Xapian') { if (eval { require PublicInbox::Search } && PublicInbox::Search::load_xapian()) { next; - } - } elsif ($mod eq 'Search::Xapian::WritableDatabase') { - if (eval { require PublicInbox::SearchIdx } && - PublicInbox::SearchIdx::load_xapian_writable()){ - next; } } elsif (index($mod, '||') >= 0) { # "Foo||Bar" my $ok; diff --git a/t/altid_v2.t b/t/altid_v2.t index 493982a115b094ff01ecc9f88b70a69facb16190..47ebec85ff8e9b42fd0afbd12fcff3fb5fcfcb27 100644 --- a/t/altid_v2.t +++ b/t/altid_v2.t @@ -5,9 +5,9 @@ use strict; use v5.10.1; use PublicInbox::TestCommon; use PublicInbox::Eml; -use PublicInbox::Msgmap; require_git(2.6); require_mods(qw(DBD::SQLite Search::Xapian)); +require PublicInbox::Msgmap; my $another = 'another-nntp.sqlite3'; my $altid = [ "serial:gmane:file=$another" ]; my $ibx = create_inbox 'v2', version => 2, indexlevel => 'medium', diff --git a/t/imap.t b/t/imap.t index 0ec02818dd7dc842e63fccfeae0821ebea193352..e6efe04f7702c0c6a2b92f23ec8da32fbd9e77c6 100644 --- a/t/imap.t +++ b/t/imap.t @@ -3,11 +3,10 @@ # Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ # unit tests (no network) for IMAP, see t/imapd.t for end-to-end tests use strict; -use Test::More; +use v5.10.1; use PublicInbox::TestCommon; require_git 2.6; -require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address - Parse::RecDescent)); +require_mods(qw(-imapd)); require_ok 'PublicInbox::IMAP'; require_ok 'PublicInbox::IMAPD'; diff --git a/t/imap_searchqp.t b/t/imap_searchqp.t index 6b4121ea91a876db331f584575b76595ba876593..e2f49e5aa27496290a7e4e4e3f8aa9dfd4c1f78d 100644 --- a/t/imap_searchqp.t +++ b/t/imap_searchqp.t @@ -2,11 +2,10 @@ #!perl -w # Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ use strict; -use Test::More; +use v5.10.1; use Time::Local qw(timegm); use PublicInbox::TestCommon; -require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address - Parse::RecDescent)); +require_mods(qw(-imapd)); use_ok 'PublicInbox::IMAPsearchqp'; use_ok 'PublicInbox::IMAP'; diff --git a/t/imapd-tls.t b/t/imapd-tls.t index 125846e27de95f19049cab9730dda6de022d2803..72ba8769610a90db756fb20d6773e090e010abb6 100644 --- a/t/imapd-tls.t +++ b/t/imapd-tls.t @@ -6,8 +6,7 @@ use Test::More; use Socket qw(IPPROTO_TCP SOL_SOCKET); use PublicInbox::TestCommon; # IO::Poll is part of the standard library, but distros may split it off... -require_mods(qw(DBD::SQLite IO::Socket::SSL Mail::IMAPClient IO::Poll - Email::Address::XS||Mail::Address Parse::RecDescent)); +require_mods(qw(-imapd IO::Socket::SSL Mail::IMAPClient IO::Poll)); my $imap_client = 'Mail::IMAPClient'; $imap_client->can('starttls') or plan skip_all => 'Mail::IMAPClient does not support TLS'; diff --git a/t/imapd.t b/t/imapd.t index c9911d1b12dbd854abcd4763f07f2dae74a2a37c..8cdb4e4aa12e85f04ff9268f6e8cee0eec0c00d5 100644 --- a/t/imapd.t +++ b/t/imapd.t @@ -8,8 +8,7 @@ use Time::HiRes (); use PublicInbox::TestCommon; use PublicInbox::Config; use PublicInbox::Spawn qw(which); -require_mods(qw(DBD::SQLite Mail::IMAPClient Mail::IMAPClient::BodyStructure - Email::Address::XS||Mail::Address Parse::RecDescent)); +require_mods(qw(-imapd Mail::IMAPClient)); my $imap_client = 'Mail::IMAPClient'; my $can_compress = $imap_client->can('compress'); if ($can_compress) { # hope this gets fixed upstream, soon diff --git a/t/init.t b/t/init.t index b8dfea663a357abc78ccc6801432b364423176bb..d46bef234b2f2d52376cc7a35c0bf2394371b75e 100644 --- a/t/init.t +++ b/t/init.t @@ -74,7 +74,7 @@ ok(!run_script($cmd, $env, $rdr), 'fails on D/F conflict'); } SKIP: { - require_mods(qw(DBD::SQLite Search::Xapian::WritableDatabase), 2); + require_mods(qw(DBD::SQLite Search::Xapian), 2); require_git(2.6, 1) or skip "git 2.6+ required", 2; use_ok 'PublicInbox::Msgmap'; local $ENV{PI_DIR} = "$tmpdir/.public-inbox/"; diff --git a/t/lei-convert.t b/t/lei-convert.t index 9b430d8e984d7e2073623779710732422122fc43..7ff628f9faa3a978084193462480b652752e16f6 100644 --- a/t/lei-convert.t +++ b/t/lei-convert.t @@ -6,8 +6,7 @@ use PublicInbox::MboxReader; use PublicInbox::MdirReader; use PublicInbox::NetReader; use PublicInbox::Eml; -require_git 2.6; -require_mods(qw(DBD::SQLite Search::Xapian Mail::IMAPClient Net::NNTP)); +require_mods(qw(lei -imapd -nntpd Mail::IMAPClient Net::NNTP)); my ($tmpdir, $for_destroy) = tmpdir; my $sock = tcp_server; my $cmd = [ '-imapd', '-W0', "--stdout=$tmpdir/i1", "--stderr=$tmpdir/i2" ]; diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t index 15a355ab6a7523a3f95b3b778d2cd54aaa905536..fd38037ae9c1654b47af76759df442e3559a05df 100644 --- a/t/lei-import-imap.t +++ b/t/lei-import-imap.t @@ -2,8 +2,7 @@ #!perl -w # Copyright (C) 2021 all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; -require_git 2.6; -require_mods(qw(DBD::SQLite Search::Xapian Mail::IMAPClient)); +require_mods(qw(lei -imapd Mail::IMAPClient)); my ($ro_home, $cfg_path) = setup_public_inboxes; my ($tmpdir, $for_destroy) = tmpdir; my $sock = tcp_server; diff --git a/t/lei-mirror.t b/t/lei-mirror.t index 6039e568224f3d51d65656035898f5d374724a48..5ab18b6d6e64d23387d717a0148c5ac3d1d392c6 100644 --- a/t/lei-mirror.t +++ b/t/lei-mirror.t @@ -2,8 +2,7 @@ #!perl -w # Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; -require_git 2.6; -require_mods(qw(DBD::SQLite Search::Xapian)); +require_mods(qw(-httpd lei)); my $sock = tcp_server(); my ($tmpdir, $for_destroy) = tmpdir(); my $http = 'http://'.tcp_host_port($sock); diff --git a/t/lei-q-remote-import.t b/t/lei-q-remote-import.t index 93828a242f16f47a03af08efab05761b3635893e..32c5172bdea63051a758da84773a603e1864742a 100644 --- a/t/lei-q-remote-import.t +++ b/t/lei-q-remote-import.t @@ -2,8 +2,7 @@ #!perl -w # Copyright (C) 2021 all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; -require_git 2.6; -require_mods(qw(json DBD::SQLite Search::Xapian)); +require_mods(qw(lei -httpd)); use PublicInbox::MboxReader; my ($ro_home, $cfg_path) = setup_public_inboxes; my $sock = tcp_server; diff --git a/t/net_reader-imap.t b/t/net_reader-imap.t index adcd69314b9c646421a158bc2960f6fdfe93c0a9..e478ee07fdced399e7d37e5158af438779d88868 100644 --- a/t/net_reader-imap.t +++ b/t/net_reader-imap.t @@ -3,7 +3,7 @@ # Copyright (C) 2021 all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; require_git 2.6; -require_mods(qw(DBD::SQLite Search::Xapian Mail::IMAPClient)); +require_mods(qw(-imapd Search::Xapian Mail::IMAPClient)); use PublicInbox::Config; my ($tmpdir, $for_destroy) = tmpdir; my ($ro_home, $cfg_path) = setup_public_inboxes; diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t index 6635e2b477ee80381dd64118f5bb5bd1f4f5757b..0baf5b4cc073d0421c9f030eb5b4be7f245311c4 100644 --- a/xt/imapd-mbsync-oimap.t +++ b/xt/imapd-mbsync-oimap.t @@ -3,11 +3,11 @@ # Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ # ensure mbsync and offlineimap compatibility use strict; -use Test::More; +use v5.10.1; use File::Path qw(mkpath); use PublicInbox::TestCommon; use PublicInbox::Spawn qw(which spawn); -require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address)); +require_mods(qw(-imapd)); my $inboxdir = $ENV{GIANT_INBOX_DIR}; (defined($inboxdir) && -d $inboxdir) or plan skip_all => "GIANT_INBOX_DIR not defined for $0"; diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t index 3a229883409e6847042ca82fd8c7dbcbbcc2206b..5d27d2a0655eefddb914522a62453311a9c1c467 100644 --- a/xt/imapd-validate.t +++ b/xt/imapd-validate.t @@ -3,7 +3,7 @@ # Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ # Expensive test to validate compression and TLS. use strict; -use Test::More; +use v5.10.1; use Symbol qw(gensym); use PublicInbox::DS qw(now); use POSIX qw(_exit); @@ -15,7 +15,7 @@ my $BATCH = $ENV{TEST_BATCH} // 100; my $REPEAT = $ENV{TEST_REPEAT} // 1; diag "TEST_BATCH=$BATCH TEST_REPEAT=$REPEAT"; -require_mods(qw(Mail::IMAPClient Email::Address::XS||Mail::Address)); +require_mods(qw(Mail::IMAPClient -imapd)); my $imap_client = 'Mail::IMAPClient'; my $can_compress = $imap_client->can('compress'); if ($can_compress) { # hope this gets fixed upstream, soon diff --git a/xt/mem-imapd-tls.t b/xt/mem-imapd-tls.t index 99d8cb0dbe66a7f8c3005ca6fb9066aba84fe022..bd75ef452984248cfe0180d3579e68d8ba1f86d0 100644 --- a/xt/mem-imapd-tls.t +++ b/xt/mem-imapd-tls.t @@ -4,13 +4,12 @@ # License: AGPL-3.0+ # Idle client memory usage test, particularly after EXAMINE when # Message Sequence Numbers are loaded use strict; -use Test::More; +use v5.10.1; use Socket qw(SOCK_STREAM IPPROTO_TCP SOL_SOCKET); use PublicInbox::TestCommon; use PublicInbox::Syscall qw(:epoll); use PublicInbox::DS; -require_mods(qw(DBD::SQLite Email::Address::XS||Mail::Address - Parse::RecDescent)); +require_mods(qw(-imapd)); my $inboxdir = $ENV{GIANT_INBOX_DIR}; my $TEST_TLS; SKIP: {