X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv1reindex.t;h=240e28f92d6cd16c486bd731cf98c5cae10ac8be;hb=daab9cf0b8fcd66d1cb7f62f7ea9a8b0e32320ef;hp=876c9db3441aee0f341ce28ec5554ab5414aed8a;hpb=1597d1a5fff6c1090cc65f439d1773cb3e98d382;p=public-inbox.git
diff --git a/t/v1reindex.t b/t/v1reindex.t
index 876c9db3..240e28f9 100644
--- a/t/v1reindex.t
+++ b/t/v1reindex.t
@@ -1,23 +1,20 @@
-# Copyright (C) 2018 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use PublicInbox::MIME;
use PublicInbox::ContentId qw(content_digest);
-use File::Temp qw/tempdir/;
use File::Path qw(remove_tree);
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
- eval "require $mod";
- plan skip_all => "$mod missing for v1reindex.t" if $@;
-}
+use PublicInbox::TestCommon;
+require_git(2.6);
+require_mods(qw(DBD::SQLite Search::Xapian));
use_ok 'PublicInbox::SearchIdx';
use_ok 'PublicInbox::Import';
-my $mainrepo = tempdir('pi-v1reindex-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-is(system(qw(git init -q --bare), $mainrepo), 0);
+my ($inboxdir, $for_destroy) = tmpdir();
+is(system(qw(git init -q --bare), $inboxdir), 0);
my $ibx_config = {
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => 'test-v1reindex',
-primary_address => 'test@example.com',
indexlevel => 'full',
@@ -63,6 +60,7 @@ my ($mark1, $mark2, $mark3, $mark4);
$minmax = [ $ibx->mm->minmax ];
ok(defined $minmax->[0] && defined $minmax->[1], 'minmax defined');
is_deeply($minmax, [ 1, 10 ], 'minmax as expected');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
my ($min, $max) = @$minmax;
$msgmap = $ibx->mm->msg_range(\$min, $max);
@@ -87,11 +85,13 @@ my ($mark1, $mark2, $mark3, $mark4);
is($@, '', 'no error from reindexing');
$im->done;
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
my ($min, $max) = $ibx->mm->minmax;
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
-my $xap = "$mainrepo/public-inbox/xapian".PublicInbox::Search::SCHEMA_VERSION();
+my $xap = "$inboxdir/public-inbox/xapian".PublicInbox::Search::SCHEMA_VERSION();
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed');
{
@@ -107,12 +107,13 @@ ok(!-d $xap, 'Xapian directories removed');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
my ($min, $max) = $ibx->mm->minmax;
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
-ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+ok(unlink "$inboxdir/public-inbox/msgmap.sqlite3", 'remove msgmap');
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed again');
{
@@ -129,12 +130,13 @@ ok(!-d $xap, 'Xapian directories removed again');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
my ($min, $max) = $ibx->mm->minmax;
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
-ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+ok(unlink "$inboxdir/public-inbox/msgmap.sqlite3", 'remove msgmap');
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed again');
{
@@ -151,12 +153,13 @@ ok(!-d $xap, 'Xapian directories removed again');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
my ($min, $max) = @$minmax;
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
-ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+ok(unlink "$inboxdir/public-inbox/msgmap.sqlite3", 'remove msgmap');
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed again');
{
@@ -174,6 +177,7 @@ ok(!-d $xap, 'Xapian directories removed again');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
my $mset = $ibx->search->query('hello world', {mset=>1});
isnt($mset->size, 0, 'got Xapian search results');
@@ -181,7 +185,7 @@ ok(!-d $xap, 'Xapian directories removed again');
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
-ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+ok(unlink "$inboxdir/public-inbox/msgmap.sqlite3", 'remove msgmap');
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed again');
{
@@ -199,8 +203,8 @@ ok(!-d $xap, 'Xapian directories removed again');
ok(-d $xap, 'Xapian directories recreated');
delete $ibx->{mm};
is_deeply([ $ibx->mm->minmax ], $minmax, 'minmax unchanged');
- my $mset = $ibx->search->reopen->query('hello world', {mset=>1});
- is($mset->size, 0, "no Xapian search results");
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+ isnt($ibx->search, 'no search for basic');
my ($min, $max) = $ibx->mm->minmax;
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
@@ -214,7 +218,7 @@ ok(!-d $xap, 'Xapian directories removed again');
my @warn;
local $SIG{__WARN__} = sub { push @warn, @_ };
my %config = %$ibx_config;
- $config{indexleve} = 'medium';
+ $config{indexlevel} = 'medium';
my $ibx = PublicInbox::Inbox->new(\%config);
my $rw = PublicInbox::SearchIdx->new($ibx, 1);
eval { $rw->index_sync };
@@ -223,12 +227,14 @@ ok(!-d $xap, 'Xapian directories removed again');
my $mset = $ibx->search->reopen->query('hello world', {mset=>1});
isnt($mset->size, 0, 'search OK after basic -> medium');
+ is($ibx->mm->num_highwater, 10, 'num_highwater as expected');
+
my ($min, $max) = $ibx->mm->minmax;
is_deeply($ibx->mm->msg_range(\$min, $max), $msgmap, 'msgmap unchanged');
}
# An incremental indexing test
-ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+ok(unlink "$inboxdir/public-inbox/msgmap.sqlite3", 'remove msgmap');
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed again');
{
@@ -338,7 +344,7 @@ ok(!-d $xap, 'Xapian directories removed again');
# Another incremental indexing test
-ok(unlink "$mainrepo/public-inbox/msgmap.sqlite3", 'remove msgmap');
+ok(unlink "$inboxdir/public-inbox/msgmap.sqlite3", 'remove msgmap');
remove_tree($xap);
ok(!-d $xap, 'Xapian directories removed again');
{