sigfd: fix typos and scoping on systems w/o epoll+kqueue

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

diff --git a/t/xcpdb-reshard.t b/t/xcpdb-reshard.t
index 70012cc6f49ee9193816d660051076149235a415..c1af5d9a8f669ac53f25d00e925a9e928b651750 100644 (file)
--- a/t/xcpdb-reshard.t
+++ b/t/xcpdb-reshard.t
@@ -30,7 +30,7 @@ my $ibx = PublicInbox::Inbox->new({
 my @xcpdb = qw(-xcpdb -q);
 my $nproc = 8;
 my $ndoc = 13;
-my $im = PublicInbox::InboxWritable->new($ibx, {nproc => $nproc})->importer(1);
+my $im = PublicInbox::InboxWritable->new($ibx, {nproc => $nproc})->importer;
 for my $i (1..$ndoc) {
        $mime->header_set('Message-ID', "<m$i\@example.com>");
        ok($im->add($mime), "message $i added");
@@ -49,7 +49,8 @@ for my $R (qw(2 4 1 3 3)) {
        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);