tests: add use/require statements for TEST_RUN_MODE=0

[public-inbox.git] / t / indexlevels-mirror.t

diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index aae42510491d2d9759ce2fda2c58c0e1f5cfe9de..44313e40118bb6e9073694e090f63e05c58dd72f 100644 (file)
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -1,30 +1,25 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::Inbox;
 use PublicInbox::InboxWritable;
 require PublicInbox::Admin;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2;
 require_git('2.6') if $PI_TEST_VERSION == 2;
+require_mods(qw(DBD::SQLite));
 
-foreach my $mod (qw(DBD::SQLite)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for $0" if $@;
-}
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Date: Fri, 02 Oct 1993 00:00:00 +0000
 
-my $mime = PublicInbox::MIME->create(
-       header => [
-               From => 'a@example.com',
-               To => 'test@example.com',
-               Subject => 'this is a subject',
-               Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
-       ],
-       body => "hello world\n",
-);
+hello world
+EOF
 
 sub import_index_incremental {
        my ($v, $level, $mime) = @_;
@@ -38,13 +33,13 @@ sub import_index_incremental {
                -primary_address => 'test@example.com',
                indexlevel => $level,
        });
-       my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer;
+       my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer(0);
        $mime->header_set('Message-ID', '<m@1>');
        ok($im->add($mime), 'first message added');
        $im->done;
 
        # index master (required for v1)
-       ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]),
+       ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]),
                'index master OK');
        my $ro_master = PublicInbox::Inbox->new({
                inboxdir => $ibx->{inboxdir},
@@ -63,7 +58,7 @@ sub import_index_incremental {
                push @cmd, "$ibx->{inboxdir}/git/0.git", "$mirror/git/0.git";
        }
        my $fetch_dir = $cmd[-1];
-       is(system(@cmd), 0, "v$v clone OK");
+       is(xsys(@cmd), 0, "v$v clone OK");
 
        # inbox init
        local $ENV{PI_CONFIG} = "$tmpdir/.picfg";
@@ -73,7 +68,7 @@ sub import_index_incremental {
        ok(run_script(\@cmd), "v$v init OK");
 
        # index mirror
-       ok(run_script(['-index', $mirror]), "v$v index mirror OK");
+       ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror OK");
 
        # read-only access
        my $ro_mirror = PublicInbox::Inbox->new({
@@ -90,15 +85,15 @@ sub import_index_incremental {
        $im->done;
 
        # mirror updates
-       is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
-       ok(run_script(['-index', $mirror]), "v$v index mirror again OK");
+       is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
+       ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror again OK");
        ($nr, $msgs) = $ro_mirror->recent;
        is($nr, 2, '2nd message seen in mirror');
        is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
                ['m@1','m@2'], 'got both messages in mirror');
 
        # incremental index master (required for v1)
-       ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]),
+       ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]),
                'index master OK');
        ($nr, $msgs) = $ro_master->recent;
        is($nr, 2, '2nd message seen in master');
@@ -127,8 +122,8 @@ sub import_index_incremental {
        }
 
        # sync the mirror
-       is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
-       ok(run_script(['-index', $mirror]), "v$v index mirror again OK");
+       is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
+       ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror again OK");
        ($nr, $msgs) = $ro_mirror->recent;
        is($nr, 1, '2nd message gone from mirror');
        is_deeply([map { $_->{mid} } @$msgs], ['m@1'],
@@ -152,8 +147,8 @@ sub import_index_incremental {
                push @expect, $i;
        }
        $im->done;
-       is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
-       ok(run_script(['-index', '--reindex', $mirror]),
+       is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
+       ok(run_script([qw(-index -j0 --reindex), $mirror]),
                "v$v index --reindex mirror OK");
        @ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)};
        @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
@@ -169,7 +164,8 @@ import_index_incremental($PI_TEST_VERSION, 'basic', $mime);
 
 SKIP: {
        require PublicInbox::Search;
-       PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2;
+       PublicInbox::Search::load_xapian() or
+               skip('Xapian perl binding missing', 2);
        foreach my $l (qw(medium full)) {
                import_index_incremental($PI_TEST_VERSION, $l, $mime);
        }