v2: fix reindex skipping NNTP article numbers

[public-inbox.git] / t / indexlevels-mirror.t

diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index 3dd432382672344bb4458acb0c2ef95c03160fbd..125113689a51121df5b739aa8f7813582bc7bfc2 100644 (file)
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -5,6 +5,7 @@ use warnings;
 use Test::More;
 use PublicInbox::MIME;
 use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
 use File::Temp qw/tempdir/;
 require './t/common.perl';
 require_git(2.6);
@@ -17,6 +18,7 @@ foreach my $mod (qw(DBD::SQLite)) {
 
 my $path = 'blib/script';
 my $index = "$path/public-inbox-index";
+my @xcpdb = ("$path/public-inbox-xcpdb", '-q');
 
 my $mime = PublicInbox::MIME->create(
        header => [
@@ -38,9 +40,7 @@ sub import_index_incremental {
                -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', '<m@1>');
        ok($im->add($mime), 'first message added');
        $im->done;
@@ -79,7 +79,7 @@ sub import_index_incremental {
        # read-only access
        my $ro_mirror = PublicInbox::Inbox->new({
                mainrepo => $mirror,
-               indexlevel => 'basic'
+               indexlevel => $level,
        });
        ($nr, $msgs) = $ro_mirror->recent;
        is($nr, 1, 'only one message, so far');
@@ -105,9 +105,24 @@ sub import_index_incremental {
        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') {
+               is(system(@xcpdb, $mirror), 0, "v$v xcpdb OK");
+               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');
@@ -121,6 +136,27 @@ sub import_index_incremental {
                is_deeply([glob("$ibx->{mainrepo}/xap*/?/")], [],
                         'no Xapian partition 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', "<m\@$i>");
+               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');
+       is(system($index, '--reindex', $mirror), 0,
+               "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");
 }
 
 # we can probably cull some other tests and put full/medium tests, here
@@ -132,4 +168,14 @@ for my $level (qw(basic)) {
        }
 }
 
+SKIP: {
+       require PublicInbox::Search;
+       PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2;
+       for my $v (1..2) {
+               subtest("v$v indexlevel=medium" => sub {
+                       import_index_incremental($v, 'medium');
+               })
+       }
+}
+
 done_testing();