X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fextsearch.t;h=2d7375d63f9a6467f3b98b80da2715589ad4b573;hb=94a70f57bf1b449192c9d68637cf985b8d5cfaca;hp=1b6235ba0eca3f8a1581c2e633da3c81b930e485;hpb=ed0167d2a851b4f5128f57ad60309a0b76e62cfa;p=public-inbox.git
diff --git a/t/extsearch.t b/t/extsearch.t
index 1b6235ba..2d7375d6 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -1,5 +1,5 @@
#!perl -w
-# Copyright (C) 2020-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
use strict;
use Test::More;
@@ -54,7 +54,8 @@ run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or BAIL_OUT '-mda';
run_script([qw(-index -Lbasic), "$home/v1test"]) or BAIL_OUT "index $?";
-ok(run_script([qw(-extindex --all), "$home/extindex"]), 'extindex init');
+ok(run_script([qw(-extindex --dangerous --all), "$home/extindex"]),
+ 'extindex init');
{
my $es = PublicInbox::ExtSearch->new("$home/extindex");
ok($es->has_threadid, '->has_threadid');
@@ -176,7 +177,7 @@ if ('inbox edited') {
is($mset->size, 1, 'new message found');
$mset = $es->mset('b:"test message"');
is($mset->size, 1, 'old message found');
- delete @$es{qw(git over xdb)}; # fork preparation
+ delete @$es{qw(git over xdb qp)}; # fork preparation
my $pi_cfg = PublicInbox::Config->new;
$pi_cfg->fill_all;
@@ -313,7 +314,12 @@ if ('reindex catches missed messages') {
is($new->{subject}, $eml->header('Subject'), 'new message added');
$es->{xdb}->reopen;
- my $mset = $es->mset("mid:$new->{mid}");
+ # git patch-id --stable search->mset("patchid:$patchid");
+ is($mset->size, 1, 'patchid search works');
+
+ $mset = $es->mset("mid:$new->{mid}");
is($mset->size, 1, 'previously unseen, now indexed in Xapian');
ok($im->remove($eml), 'remove new message from v2 inbox');
@@ -447,9 +453,6 @@ SKIP: {
ok(ref($es->{xdb}), '{xdb} created');
my $nshards1 = $es->{nshard};
is($nshards1, 1, 'correct shard count');
- my $xdb_str = "$es->{xdb}";
- ok($es->cleanup_shards, 'cleanup_shards noop');
- is("$es->{xdb}", $xdb_str, '{xdb} unchanged');
my @ei_dir = glob("$d/ei*/");
chmod 0755, $ei_dir[0] or xbail "chmod: $!";
@@ -463,11 +466,8 @@ SKIP: {
my $m = sprintf('%04o', 07777 & (stat($dirs[$i]))[2]);
is($m, $mode, "shard [$i] mode");
}
- is($es->cleanup_shards, undef, 'cleanup_shards cleaned');
- ok(!defined($es->{xdb}), 'old {xdb} gone');
- is($es->cleanup_shards, undef, 'cleanup_shards clean idempotent');
+ delete @$es{qw(xdb qp)};
is($es->mset('z:0..')->size, $nresult0, 'new shards, same results');
- ok($es->cleanup_shards, 'cleanup_shards true after open');
for my $i (4..5) {
is(grep(m!/ei[0-9]+/$i\z!, @dirs), 0, "no shard [$i]");