treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index f1c338e189fa5d648ff1532597e95677635fa440..77c5271835a08949b988fec4c468dc81f36031b7 100644 (file)
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -1,4 +1,4 @@
-# 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;
@@ -7,16 +7,10 @@ use PublicInbox::MIME;
 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;
-
-foreach my $mod (qw(DBD::SQLite)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for $0" if $@;
-}
-
-my @xcpdb = qw(-xcpdb -q);
+require_mods(qw(DBD::SQLite));
 
 my $mime = PublicInbox::MIME->create(
        header => [
@@ -29,9 +23,10 @@ my $mime = PublicInbox::MIME->create(
 );
 
 sub import_index_incremental {
-       my ($v, $level) = @_;
+       my ($v, $level, $mime) = @_;
        my $this = "pi-$v-$level-indexlevels";
        my ($tmpdir, $for_destroy) = tmpdir();
+       local $ENV{PI_CONFIG} = "$tmpdir/config";
        my $ibx = PublicInbox::Inbox->new({
                inboxdir => "$tmpdir/testbox",
                name => $this,
@@ -119,7 +114,7 @@ sub import_index_incremental {
        is_deeply(\@rw_nums, [1], 'unindex NNTP article'.$v.$level);
 
        if ($level ne 'basic') {
-               ok(run_script([@xcpdb, $mirror]), "v$v xcpdb OK");
+               ok(run_script(['-xcpdb', '-q', $mirror]), "v$v xcpdb OK");
                is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
                   'indexlevel detectable by Admin after xcpdb v' .$v.$level);
                delete $ro_mirror->{$_} for (qw(over search));
@@ -166,13 +161,14 @@ sub import_index_incremental {
 }
 
 # we can probably cull some other tests
-import_index_incremental($PI_TEST_VERSION, 'basic');
+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);
+               import_index_incremental($PI_TEST_VERSION, $l, $mime);
        }
 }