lei_to_mail: limit workers for text, reply and v2 outputs

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

diff --git a/t/extsearch.t b/t/extsearch.t
index 896e270414bd8eff0e909fe2fbdacf291bec33cf..dfc190e2d69e8a3d2628361a62db45d1102c86f2 100644 (file)
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -176,7 +176,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;
@@ -375,7 +375,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/,
@@ -447,9 +447,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 +460,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]");