X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=77c5271835a08949b988fec4c468dc81f36031b7;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=cac7050bdca3840c484cc778c3d5484e892652f3;hpb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;p=public-inbox.git diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index cac7050b..77c52718 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -1,22 +1,16 @@ -# Copyright (C) 2019 all contributors +# Copyright (C) 2019-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use PublicInbox::MIME; use PublicInbox::Inbox; -use File::Temp qw/tempdir/; -require './t/common.perl'; -require_git(2.6); -my $this = (split('/', __FILE__))[-1]; - -foreach my $mod (qw(DBD::SQLite)) { - eval "require $mod"; - plan skip_all => "$mod missing for $this" if $@; -} - -my $path = 'blib/script'; -my $index = "$path/public-inbox-index"; +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)); my $mime = PublicInbox::MIME->create( header => [ @@ -29,26 +23,27 @@ my $mime = PublicInbox::MIME->create( ); sub import_index_incremental { - my ($v, $level) = @_; - my $tmpdir = tempdir("pi-$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1); + my ($v, $level, $mime) = @_; + my $this = "pi-$v-$level-indexlevels"; + my ($tmpdir, $for_destroy) = tmpdir(); + local $ENV{PI_CONFIG} = "$tmpdir/config"; my $ibx = PublicInbox::Inbox->new({ - mainrepo => "$tmpdir/testbox", - name => "$this-$v", + inboxdir => "$tmpdir/testbox", + name => $this, version => $v, -primary_address => 'test@example.com', indexlevel => $level, }); - my $cls = "PublicInbox::V${v}Writable"; - use_ok $cls; - my $im = $cls->new($ibx, {nproc=>1}); + my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer; $mime->header_set('Message-ID', ''); ok($im->add($mime), 'first message added'); $im->done; # index master (required for v1) - is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK'); + ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]), + 'index master OK'); my $ro_master = PublicInbox::Inbox->new({ - mainrepo => $ibx->{mainrepo}, + inboxdir => $ibx->{inboxdir}, indexlevel => $level }); my ($nr, $msgs) = $ro_master->recent; @@ -59,27 +54,27 @@ sub import_index_incremental { my @cmd = (qw(git clone --mirror -q)); my $mirror = "$tmpdir/mirror-$v"; if ($v == 1) { - push @cmd, $ibx->{mainrepo}, $mirror; + push @cmd, $ibx->{inboxdir}, $mirror; } else { - push @cmd, "$ibx->{mainrepo}/git/0.git", "$mirror/git/0.git"; + push @cmd, "$ibx->{inboxdir}/git/0.git", "$mirror/git/0.git"; } my $fetch_dir = $cmd[-1]; is(system(@cmd), 0, "v$v clone OK"); # inbox init local $ENV{PI_CONFIG} = "$tmpdir/.picfg"; - @cmd = ("$path/public-inbox-init", '-L', $level, + @cmd = ('-init', '-L', $level, 'mirror', $mirror, '//example.com/test', 'test@example.com'); push @cmd, '-V2' if $v == 2; - is(system(@cmd), 0, "v$v init OK"); + ok(run_script(\@cmd), "v$v init OK"); # index mirror - is(system($index, $mirror), 0, "v$v index mirror OK"); + ok(run_script(['-index', $mirror]), "v$v index mirror OK"); # read-only access my $ro_mirror = PublicInbox::Inbox->new({ - mainrepo => $mirror, - indexlevel => 'basic' + inboxdir => $mirror, + indexlevel => $level, }); ($nr, $msgs) = $ro_mirror->recent; is($nr, 1, 'only one message, so far'); @@ -92,38 +87,88 @@ sub import_index_incremental { # mirror updates is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK'); - is(system($index, $mirror), 0, "v$v index mirror again OK"); + ok(run_script(['-index', $mirror]), "v$v index mirror again OK"); ($nr, $msgs) = $ro_mirror->recent; is($nr, 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) - is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK'); + ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]), + 'index master OK'); ($nr, $msgs) = $ro_master->recent; is($nr, 2, '2nd message seen in master'); is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs], ['m@1','m@2'], 'got both messages in master'); + my @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)}; + is_deeply(\@rw_nums, [1, 2], 'master has expected NNTP articles'); + + my @ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)}; + is_deeply(\@ro_nums, [1, 2], 'mirror has expected NNTP articles'); + # remove message from master ok($im->remove($mime), '2nd message removed'); $im->done; + @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)}; + is_deeply(\@rw_nums, [1], 'unindex NNTP article'.$v.$level); + + if ($level ne 'basic') { + ok(run_script(['-xcpdb', '-q', $mirror]), "v$v xcpdb OK"); + 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"); + } # sync the mirror is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK'); - is(system($index, $mirror), 0, "v$v index mirror again OK"); + ok(run_script(['-index', $mirror]), "v$v index mirror again OK"); ($nr, $msgs) = $ro_mirror->recent; is($nr, 1, '2nd message gone from mirror'); is_deeply([map { $_->{mid} } @$msgs], ['m@1'], 'message unavailable in mirror'); + + if ($v == 2 && $level eq 'basic') { + is_deeply([glob("$ibx->{inboxdir}/xap*/?/")], [], + '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"); + } + + # add another message to master and have the mirror + # sync and reindex it + my @expect = map { $_->{num} } @{$ibx->over->query_ts(0, 0)}; + foreach my $i (3..5) { + $mime->header_set('Message-ID', ""); + ok($im->add($mime), "#$i message added"); + push @expect, $i; + } + $im->done; + is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK'); + ok(run_script(['-index', '--reindex', $mirror]), + "v$v index --reindex mirror OK"); + @ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)}; + @rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)}; + is_deeply(\@rw_nums, \@expect, "v$v master has expected NNTP articles"); + is_deeply(\@ro_nums, \@expect, "v$v mirror matches master articles"); + + is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level, + 'indexlevel detectable by Admin '.$v.$level); } -# we can probably cull some other tests and put full/medium tests, here -for my $level (qw(basic)) { - for my $v (1..2) { - subtest("v$v indexlevel=$level" => sub { - import_index_incremental($v, $level); - }) +# we can probably cull some other tests +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); } }