X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=e606e79b183e8a96ac64555c3cfe1b9d6778723e;hb=69b5ab18a594fa434d79cacee35c4d9a0df7b55c;hp=27533546e4c4a320bb9cf3bad3deeb79e3b7228d;hpb=b61b55643c617403f8d141cfe9bff22ad47913f7;p=public-inbox.git
diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index 27533546..e606e79b 100644
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -1,18 +1,15 @@
-# Copyright (C) 2019-2020 all contributors
+#!perl -w
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
+use PublicInbox::TestCommon;
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
@@ -28,22 +25,17 @@ my $import_index_incremental = sub {
my $err = '';
my $this = "pi-$v-$level-indexlevels";
my ($tmpdir, $for_destroy) = tmpdir();
+ my $ibx = create_inbox "testbox$v", indexlevel => $level,
+ version => $v, tmpdir => "$tmpdir/v$v", sub {
+ $mime->header_set('Message-ID', '');
+ $_[0]->add($mime) or BAIL_OUT;
+ };
+ my $im = $ibx->importer(0);
local $ENV{PI_CONFIG} = "$tmpdir/config";
- my $ibx = PublicInbox::Inbox->new({
- inboxdir => "$tmpdir/testbox",
- name => $this,
- version => $v,
- -primary_address => 'test@example.com',
- indexlevel => $level,
- });
- my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer(0);
- $mime->header_set('Message-ID', '');
- ok($im->add($mime), 'first message added');
- $im->done;
# 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},
@@ -121,8 +113,8 @@ 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));
- $msgs = $ro_mirror->search->query('m:m@2');
- is(scalar(@$msgs), 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
@@ -138,8 +130,8 @@ my $import_index_incremental = sub {
'no Xapian shard directories for v2 basic');
}
if ($level ne 'basic') {
- $msgs = $ro_mirror->search->reopen->query('m:m@2');
- is(scalar(@$msgs), 0,
+ 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");
}
@@ -164,9 +156,10 @@ 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");
+ ok(run_script($cmd, undef, { 2 => \$err}), "compact $level")
+ or diag $err;
}
};
@@ -174,9 +167,7 @@ my $import_index_incremental = sub {
$import_index_incremental->($PI_TEST_VERSION, 'basic', $mime);
SKIP: {
- require PublicInbox::Search;
- PublicInbox::Search::load_xapian() or
- skip('Xapian perl binding missing', 2);
+ require_mods(qw(Search::Xapian), 2);
foreach my $l (qw(medium full)) {
$import_index_incremental->($PI_TEST_VERSION, $l, $mime);
}