tests: consistently check for xapian-compact

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

diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index 859c2c17fabfac30e27ea6fac0c3de23e072968c..b12bd3cb2b177276cb01397ad660cf10dc9f571e 100644 (file)
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -6,13 +6,11 @@ use Test::More;
 use PublicInbox::Eml;
 use PublicInbox::Inbox;
 use PublicInbox::InboxWritable;
-use PublicInbox::Spawn qw(which);
 require PublicInbox::Admin;
 use PublicInbox::TestCommon;
 my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2;
 require_git('2.6') if $PI_TEST_VERSION == 2;
 require_mods(qw(DBD::SQLite));
-my $have_xapian_compact = which($ENV{XAPIAN_COMPACT} || 'xapian-compact');
 
 my $mime = PublicInbox::Eml->new(<<'EOF');
 From: a@example.com
@@ -43,14 +41,14 @@ my $import_index_incremental = sub {
 
        # index master (required for v1)
        my @cmd = (qw(-index -j0), $ibx->{inboxdir}, "-L$level");
-       push @cmd, '-c' if $have_xapian_compact;
+       push @cmd, '-c' if have_xapian_compact;
        ok(run_script(\@cmd, undef, { 2 => \$err }), 'index master');
        my $ro_master = PublicInbox::Inbox->new({
                inboxdir => $ibx->{inboxdir},
                indexlevel => $level
        });
-       my ($nr, $msgs) = $ro_master->recent;
-       is($nr, 1, 'only one message in master, so far');
+       my $msgs = $ro_master->recent;
+       is(scalar(@$msgs), 1, 'only one message in master, so far');
        is($msgs->[0]->{mid}, 'm@1', 'first message in master indexed');
 
        # clone
@@ -79,8 +77,8 @@ my $import_index_incremental = sub {
                inboxdir => $mirror,
                indexlevel => $level,
        });
-       ($nr, $msgs) = $ro_mirror->recent;
-       is($nr, 1, 'only one message, so far');
+       $msgs = $ro_mirror->recent;
+       is(scalar(@$msgs), 1, 'only one message, so far');
        is($msgs->[0]->{mid}, 'm@1', 'read first message');
 
        # update master
@@ -91,16 +89,16 @@ my $import_index_incremental = sub {
        # mirror updates
        is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
        ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror again OK");
-       ($nr, $msgs) = $ro_mirror->recent;
-       is($nr, 2, '2nd message seen in mirror');
+       $msgs = $ro_mirror->recent;
+       is(scalar(@$msgs), 2, '2nd message seen in mirror');
        is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
                ['m@1','m@2'], 'got both messages in mirror');
 
        # incremental index master (required for v1)
        ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]),
                'index master OK');
-       ($nr, $msgs) = $ro_master->recent;
-       is($nr, 2, '2nd message seen in master');
+       $msgs = $ro_master->recent;
+       is(scalar(@$msgs), 2, '2nd message seen in master');
        is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
                ['m@1','m@2'], 'got both messages in master');
 
@@ -121,15 +119,15 @@ my $import_index_incremental = sub {
                is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
                   'indexlevel detectable by Admin after xcpdb v' .$v.$level);
                delete $ro_mirror->{$_} for (qw(over search));
-               ($nr, $msgs) = $ro_mirror->search->query('m:m@2');
-               is($nr, 1, "v$v found m\@2 via Xapian on $level");
+               my $mset = $ro_mirror->search->mset('m:m@2');
+               is($mset->size, 1, "v$v found m\@2 via Xapian on $level");
        }
 
        # sync the mirror
        is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
        ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror again OK");
-       ($nr, $msgs) = $ro_mirror->recent;
-       is($nr, 1, '2nd message gone from mirror');
+       $msgs = $ro_mirror->recent;
+       is(scalar(@$msgs), 1, '2nd message gone from mirror');
        is_deeply([map { $_->{mid} } @$msgs], ['m@1'],
                'message unavailable in mirror');
 
@@ -138,8 +136,9 @@ my $import_index_incremental = sub {
                         'no Xapian shard directories for v2 basic');
        }
        if ($level ne 'basic') {
-               ($nr, $msgs) = $ro_mirror->search->reopen->query('m:m@2');
-               is($nr, 0, "v$v m\@2 gone from Xapian in mirror on $level");
+               my $mset = $ro_mirror->search->reopen->mset('m:m@2');
+               is($mset->size, 0,
+                       "v$v m\@2 gone from Xapian in mirror on $level");
        }
 
        # add another message to master and have the mirror
@@ -163,7 +162,7 @@ my $import_index_incremental = sub {
           'indexlevel detectable by Admin '.$v.$level);
 
        SKIP: {
-               skip 'xapian-compact missing', 1 if !$have_xapian_compact;
+               skip 'xapian-compact missing', 1 if have_xapian_compact;
                my $cmd = [ qw(-compact), $mirror ];
                ok(run_script($cmd, undef, { 2 => \$err}), "compact $level");
        }