X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=463b35becc49ac3ac79be30cc625a049f744b1eb;hb=65db62eb006fdbe74348f0e8f2ef9b9e938cb90b;hp=291e0d2fc121c8f5dc2d3440580d13ca19aea86e;hpb=80b887f29b2ec71d025b4c266a1c26314758994c;p=public-inbox.git
diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index 291e0d2f..463b35be 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) 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,28 +25,23 @@ 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;
+ my @cmd = (qw(-index -j0 --dangerous), $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 $msgs = $ro_master->recent;
+ my $msgs = $ro_master->over->recent;
is(scalar(@$msgs), 1, 'only one message in master, so far');
is($msgs->[0]->{mid}, 'm@1', 'first message in master indexed');
@@ -79,7 +71,7 @@ my $import_index_incremental = sub {
inboxdir => $mirror,
indexlevel => $level,
});
- $msgs = $ro_mirror->recent;
+ $msgs = $ro_mirror->over->recent;
is(scalar(@$msgs), 1, 'only one message, so far');
is($msgs->[0]->{mid}, 'm@1', 'read first message');
@@ -91,7 +83,7 @@ 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");
- $msgs = $ro_mirror->recent;
+ $msgs = $ro_mirror->over->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');
@@ -99,7 +91,7 @@ my $import_index_incremental = sub {
# incremental index master (required for v1)
ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]),
'index master OK');
- $msgs = $ro_master->recent;
+ $msgs = $ro_master->over->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');
@@ -128,7 +120,7 @@ my $import_index_incremental = sub {
# 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");
- $msgs = $ro_mirror->recent;
+ $msgs = $ro_mirror->over->recent;
is(scalar(@$msgs), 1, '2nd message gone from mirror');
is_deeply([map { $_->{mid} } @$msgs], ['m@1'],
'message unavailable in mirror');
@@ -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);
}