X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fxcpdb-reshard.t;h=58932fc2ae87b8bf54973c07c11f42e7b77811c9;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=d921e12f562ccc163995b58e04146c0582d2a683;hpb=a060a5a94d02045b48ccb8b3f4105170e52719b2;p=public-inbox.git

diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t
index d921e12f..58932fc2 100644
--- a/t/xcpdb-reshard.t
+++ b/t/xcpdb-reshard.t
@@ -1,18 +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 File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use PublicInbox::InboxWritable;
+require PublicInbox::Search;
 
 my $mime = PublicInbox::MIME->create(
 	header => [
@@ -25,16 +21,16 @@ my $mime = PublicInbox::MIME->create(
 );
 
 my ($this) = (split('/', $0))[-1];
-my $tmpdir = tempdir($this.'-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
+local $ENV{PI_CONFIG} = "$tmpdir/config";
 my $ibx = PublicInbox::Inbox->new({
-	mainrepo => "$tmpdir/testbox",
+	inboxdir => "$tmpdir/testbox",
 	name => $this,
 	version => 2,
 	-primary_address => 'test@example.com',
 	indexlevel => 'medium',
 });
-my $path = 'blib/script';
-my @xcpdb = ("$path/public-inbox-xcpdb", '-q');
+my @xcpdb = qw(-xcpdb -q);
 my $nproc = 8;
 my $ndoc = 13;
 my $im = PublicInbox::InboxWritable->new($ibx, {nproc => $nproc})->importer(1);
@@ -43,16 +39,18 @@ for my $i (1..$ndoc) {
 	ok($im->add($mime), "message $i added");
 }
 $im->done;
-my @shards = grep(m!/\d+\z!, glob("$ibx->{mainrepo}/xap*/*"));
-is(scalar(@shards), $nproc, 'got expected shards');
+my @shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*"));
+is(scalar(@shards), $nproc - 1, 'got expected shards');
 my $orig = $ibx->over->query_xover(1, $ndoc);
 my %nums = map {; "$_->{num}" => 1 } @$orig;
 
 # ensure we can go up or down in shards, or stay the same:
 for my $R (qw(2 4 1 3 3)) {
 	delete $ibx->{search}; # release old handles
-	is(system(@xcpdb, "-R$R", $ibx->{mainrepo}), 0, "xcpdb -R$R");
-	my @new_shards = grep(m!/\d+\z!, glob("$ibx->{mainrepo}/xap*/*"));
+	my $cmd = [@xcpdb, "-R$R", $ibx->{inboxdir}];
+	push @$cmd, '--compact' if $R == 1;
+	ok(run_script($cmd), "xcpdb -R$R");
+	my @new_shards = grep(m!/\d+\z!, glob("$ibx->{inboxdir}/xap*/*"));
 	is(scalar(@new_shards), $R, 'resharded to two shards');
 	my $msgs = $ibx->search->query('s:this');
 	is(scalar(@$msgs), $ndoc, 'got expected docs after resharding');
@@ -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('');