X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=b12bd3cb2b177276cb01397ad660cf10dc9f571e;hb=23eab6127c62d0228a0cfcec78a267fe5e7011c7;hp=2244870ba3166fa372d0aa6adc2426fa09a52cae;hpb=cd8dd7b08fddc7c2b5f218c3fcaa5dca5f9ad945;p=public-inbox.git diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index 2244870b..b12bd3cb 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -1,9 +1,9 @@ -# 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::Eml; use PublicInbox::Inbox; use PublicInbox::InboxWritable; require PublicInbox::Admin; @@ -12,18 +12,18 @@ 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 => [ - From => 'a@example.com', - To => 'test@example.com', - Subject => 'this is a subject', - Date => 'Fri, 02 Oct 1993 00:00:00 +0000', - ], - body => "hello world\n", -); - -sub import_index_incremental { +my $mime = PublicInbox::Eml->new(<<'EOF'); +From: a@example.com +To: test@example.com +Subject: this is a subject +Date: Fri, 02 Oct 1993 00:00:00 +0000 + +hello world +EOF + +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"; @@ -34,24 +34,25 @@ sub import_index_incremental { -primary_address => 'test@example.com', indexlevel => $level, }); - my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer; + 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(['-index', $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; @@ -59,7 +60,7 @@ sub import_index_incremental { push @cmd, "$ibx->{inboxdir}/git/0.git", "$mirror/git/0.git"; } my $fetch_dir = $cmd[-1]; - is(system(@cmd), 0, "v$v clone OK"); + is(xsys(@cmd), 0, "v$v clone OK"); # inbox init local $ENV{PI_CONFIG} = "$tmpdir/.picfg"; @@ -69,15 +70,15 @@ sub import_index_incremental { ok(run_script(\@cmd), "v$v init OK"); # index mirror - ok(run_script(['-index', $mirror]), "v$v index mirror OK"); + ok(run_script([qw(-index -j0), $mirror]), "v$v index mirror OK"); # read-only access my $ro_mirror = PublicInbox::Inbox->new({ 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 @@ -86,18 +87,18 @@ sub import_index_incremental { $im->done; # mirror updates - is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch 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(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; + 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(['-index', $ibx->{inboxdir}, "-L$level"]), + 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'); @@ -118,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(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch 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(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; + is(scalar(@$msgs), 1, '2nd message gone from mirror'); is_deeply([map { $_->{mid} } @$msgs], ['m@1'], 'message unavailable in mirror'); @@ -135,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 @@ -148,8 +150,8 @@ sub import_index_incremental { push @expect, $i; } $im->done; - is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK'); - ok(run_script(['-index', '--reindex', $mirror]), + is(xsys('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK'); + ok(run_script([qw(-index -j0 --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)}; @@ -158,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); } }