X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=b12bd3cb2b177276cb01397ad660cf10dc9f571e;hb=23eab6127c62d0228a0cfcec78a267fe5e7011c7;hp=27533546e4c4a320bb9cf3bad3deeb79e3b7228d;hpb=b61b55643c617403f8d141cfe9bff22ad47913f7;p=public-inbox.git diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index 27533546..b12bd3cb 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -6,13 +6,11 @@ use Test::More; use PublicInbox::Eml; use PublicInbox::Inbox; use PublicInbox::InboxWritable; -use PublicInbox::Spawn qw(which); 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 $have_xapian_compact = which($ENV{XAPIAN_COMPACT} || 'xapian-compact'); my $mime = PublicInbox::Eml->new(<<'EOF'); From: a@example.com @@ -43,7 +41,7 @@ my $import_index_incremental = sub { # index master (required for v1) my @cmd = (qw(-index -j0), $ibx->{inboxdir}, "-L$level"); - push @cmd, '-c' if $have_xapian_compact; + 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}, @@ -121,8 +119,8 @@ my $import_index_incremental = sub { is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level, 'indexlevel detectable by Admin after xcpdb v' .$v.$level); delete $ro_mirror->{$_} for (qw(over search)); - $msgs = $ro_mirror->search->query('m:m@2'); - is(scalar(@$msgs), 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 @@ -138,8 +136,8 @@ my $import_index_incremental = sub { 'no Xapian shard directories for v2 basic'); } if ($level ne 'basic') { - $msgs = $ro_mirror->search->reopen->query('m:m@2'); - is(scalar(@$msgs), 0, + 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"); } @@ -164,7 +162,7 @@ my $import_index_incremental = sub { 'indexlevel detectable by Admin '.$v.$level); SKIP: { - skip 'xapian-compact missing', 1 if !$have_xapian_compact; + skip 'xapian-compact missing', 1 if have_xapian_compact; my $cmd = [ qw(-compact), $mirror ]; ok(run_script($cmd, undef, { 2 => \$err}), "compact $level"); }