X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fxcpdb-reshard.t;h=1b726f1a0e8fdafef37b6d220151765764ce8796;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=1835fa62140f1e492c1fd1079855006a729602f6;hpb=8722adec7acac538c1cb92de6d53002a4e4e33b8;p=public-inbox.git
diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t
index 1835fa62..1b726f1a 100644
--- a/t/xcpdb-reshard.t
+++ b/t/xcpdb-reshard.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -45,11 +45,12 @@ my %nums = map {; "$_->{num}" => 1 } @$orig;
for my $R (qw(2 4 1 3 3)) {
delete $ibx->{search}; # release old handles
my $cmd = [@xcpdb, "-R$R", $ibx->{inboxdir}];
- push @$cmd, '--compact' if $R == 1;
+ push @$cmd, '--compact' if $R == 1 && have_xapian_compact;
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');
+ my $mset = $ibx->search->mset('s:this');
+ my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
is(scalar(@$msgs), $ndoc, 'got expected docs after resharding');
my %by_mid = map {; "$_->{mid}" => $_ } @$msgs;
ok($by_mid{"m$_\@example.com"}, "$_ exists") for (1..$ndoc);