No ext_urls

[public-inbox.git] / t / extsearch.t

diff --git a/t/extsearch.t b/t/extsearch.t
index 896e270414bd8eff0e909fe2fbdacf291bec33cf..03bcad95ee5b162bcddb922bb640d6565a49f46c 100644 (file)
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use Test::More;
@@ -13,8 +13,6 @@ require PublicInbox::Search;
 use_ok 'PublicInbox::ExtSearch';
 use_ok 'PublicInbox::ExtSearchIdx';
 use_ok 'PublicInbox::OverIdx';
-my $sock = tcp_server();
-my $host_port = tcp_host_port($sock);
 my ($home, $for_destroy) = tmpdir();
 local $ENV{HOME} = $home;
 mkdir "$home/.public-inbox" or BAIL_OUT $!;
@@ -54,7 +52,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');
@@ -124,6 +123,8 @@ EOF
 
 SKIP: {
        require_mods(qw(Net::NNTP), 1);
+       my $sock = tcp_server();
+       my $host_port = tcp_host_port($sock);
        my ($out, $err) = ("$home/nntpd.out.log", "$home/nntpd.err.log");
        my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
        my $td = start_script($cmd, undef, { 3 => $sock });
@@ -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;
@@ -308,12 +309,17 @@ if ('reindex catches missed messages') {
        is($oidx->eidx_meta($lc_key), $cmt_b, 'lc-v2 stays unchanged');
        my @err = split(/^/, $err);
        is(scalar(@err), 1, 'only one warning') or diag "err=$err";
-       like($err[0], qr/I: reindex_unseen/, 'got reindex_unseen message');
+       like($err[0], qr/# reindex_unseen/, 'got reindex_unseen message');
        my $new = $oidx->get_art($max + 1);
        is($new->{subject}, $eml->header('Subject'), 'new message added');
 
        $es->{xdb}->reopen;
-       my $mset = $es->mset("mid:$new->{mid}");
+       # git patch-id --stable <t/data/0001.patch | awk '{print $1}'
+       my $patchid = '91ee6b761fc7f47cad9f2b09b10489f313eb5b71';
+       my $mset = $es->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');
@@ -375,7 +381,7 @@ if ('reindex catches content bifurcation') {
        is($oidx->max, $oldmax, 'oidx->max unchanged');
        $oidx->dbh_close;
        ok(run_script([qw(-extindex --reindex --all), "$home/extindex"],
-               undef, $opt), 'extindex --reindex');
+               undef, $opt), 'extindex --reindex') or diag explain($opt);
        $oidx->dbh;
        ok($oidx->max > $oldmax, 'oidx->max bumped');
        like($err, qr/split into 2 due to deduplication change/,
@@ -409,8 +415,8 @@ if ('remove v1test and test gc') {
        my $opt = { 2 => \(my $err = '') };
        ok(run_script([qw(-extindex --gc), "$home/extindex"], undef, $opt),
                'extindex --gc');
-       like($err, qr/^I: remove #1 v1\.example /ms, 'removed v1 message');
-       is(scalar(grep(!/^I:/, split(/^/m, $err))), 0,
+       like($err, qr/^# remove #1 v1\.example /ms, 'removed v1 message');
+       is(scalar(grep(!/^#/, split(/^/m, $err))), 0,
                'no non-informational messages');
        $misc->{xdb}->reopen;
        @it = $misc->mset('')->items;
@@ -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]");