X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=ac85643d0423e82bcd7488fc1989f5f312960bc5;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=44313e40118bb6e9073694e090f63e05c58dd72f;hpb=8722adec7acac538c1cb92de6d53002a4e4e33b8;p=public-inbox.git diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index 44313e40..ac85643d 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -1,13 +1,12 @@ -# 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; 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)); @@ -21,36 +20,33 @@ 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(); + 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) - ok(run_script([qw(-index -j0), $ibx->{inboxdir}, "-L$level"]), - 'index master OK'); + 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 ($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 +71,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 +83,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 +113,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 +130,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 +154,22 @@ 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") + or diag $err; + } +}; # 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); + require_mods(qw(Search::Xapian), 2); foreach my $l (qw(medium full)) { - import_index_incremental($PI_TEST_VERSION, $l, $mime); + $import_index_incremental->($PI_TEST_VERSION, $l, $mime); } }