treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / t / xcpdb-reshard.t

diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t
index ebf156a31968a68829c134115f1e969b7e112ed4..58932fc2ae87b8bf54973c07c11f42e7b77811c9 100644 (file)
--- a/t/xcpdb-reshard.t
+++ b/t/xcpdb-reshard.t
@@ -1,17 +1,14 @@
-# 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;
-my @mods = qw(DBI DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "missing $mod for $0" if $@;
-};
-require './t/common.perl';
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Search::Xapian));
 require_git('2.6');
 use PublicInbox::MIME;
 use PublicInbox::InboxWritable;
+require PublicInbox::Search;
 
 my $mime = PublicInbox::MIME->create(
        header => [
@@ -25,6 +22,7 @@ my $mime = PublicInbox::MIME->create(
 
 my ($this) = (split('/', $0))[-1];
 my ($tmpdir, $for_destroy) = tmpdir();
+local $ENV{PI_CONFIG} = "$tmpdir/config";
 my $ibx = PublicInbox::Inbox->new({
        inboxdir => "$tmpdir/testbox",
        name => $this,
@@ -42,7 +40,7 @@ for my $i (1..$ndoc) {
 }
 $im->done;
 my @shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*"));
-is(scalar(@shards), $nproc, 'got expected shards');
+is(scalar(@shards), $nproc - 1, 'got expected shards');
 my $orig = $ibx->over->query_xover(1, $ndoc);
 my %nums = map {; "$_->{num}" => 1 } @$orig;
 
@@ -64,8 +62,12 @@ for my $R (qw(2 4 1 3 3)) {
        # ensure docids in Xapian match NNTP article numbers
        my $tot = 0;
        my %tmp = %nums;
+       my $XapianDatabase = do {
+               no warnings 'once';
+               $PublicInbox::Search::X{Database};
+       };
        foreach my $d (@new_shards) {
-               my $xdb = Search::Xapian::Database->new($d);
+               my $xdb = $XapianDatabase->new($d);
                $tot += $xdb->get_doccount;
                my $it = $xdb->postlist_begin('');
                my $end = $xdb->postlist_end('');