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 44313e40118bb6e9073694e090f63e05c58dd72f..b12bd3cb2b177276cb01397ad660cf10dc9f571e 100644 (file)
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -21,8 +21,9 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
 hello world
 EOF
 
-sub import_index_incremental {
+my $import_index_incremental = sub {
        my ($v, $level, $mime) = @_;
+       my $err = '';
        my $this = "pi-$v-$level-indexlevels";
        my ($tmpdir, $for_destroy) = tmpdir();
        local $ENV{PI_CONFIG} = "$tmpdir/config";
@@ -39,18 +40,19 @@ sub import_index_incremental {
        $im->done;
 
        # index master (required for v1)
-       ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]),
-               'index master OK');
+       my @cmd = (qw(-index -j0), $ibx->{inboxdir}, "-L$level");
+       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
-       my @cmd = (qw(git clone --mirror -q));
+       @cmd = (qw(git clone --mirror -q));
        my $mirror = "$tmpdir/mirror-$v";
        if ($v == 1) {
                push @cmd, $ibx->{inboxdir}, $mirror;
@@ -75,8 +77,8 @@ sub import_index_incremental {
                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
@@ -87,16 +89,16 @@ sub import_index_incremental {
        # 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');
 
@@ -117,15 +119,15 @@ sub import_index_incremental {
                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');
 
@@ -134,8 +136,9 @@ sub import_index_incremental {
                         '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
@@ -157,17 +160,23 @@ sub import_index_incremental {
 
        is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
           'indexlevel detectable by Admin '.$v.$level);
-}
+
+       SKIP: {
+               skip 'xapian-compact missing', 1 if have_xapian_compact;
+               my $cmd = [ qw(-compact), $mirror ];
+               ok(run_script($cmd, undef, { 2 => \$err}), "compact $level");
+       }
+};
 
 # we can probably cull some other tests
-import_index_incremental($PI_TEST_VERSION, 'basic', $mime);
+$import_index_incremental->($PI_TEST_VERSION, 'basic', $mime);
 
 SKIP: {
        require PublicInbox::Search;
        PublicInbox::Search::load_xapian() or
                skip('Xapian perl binding missing', 2);
        foreach my $l (qw(medium full)) {
-               import_index_incremental($PI_TEST_VERSION, $l, $mime);
+               $import_index_incremental->($PI_TEST_VERSION, $l, $mime);
        }
 }