www: drop --subject from "git send-email" instructions

[public-inbox.git] / t / thread-index-gap.t

diff --git a/t/thread-index-gap.t b/t/thread-index-gap.t
index 49f254e9a93b742220001091b997d14be20ef12e..15c362f031be8b08b529874aa39cef744fe9c240 100644 (file)
--- a/t/thread-index-gap.t
+++ b/t/thread-index-gap.t
@@ -1,12 +1,10 @@
 #!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use v5.10.1;
-use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::Eml;
-use PublicInbox::InboxWritable;
 use PublicInbox::Config;
 use List::Util qw(shuffle);
 require_mods(qw(DBD::SQLite));
@@ -31,27 +29,28 @@ References: <20201202045540.31248-1-j@example.com>
 EOF
 
 my ($home, $for_destroy) = tmpdir();
-local $ENV{HOME} = $home;
 for my $msgs (['orig', reverse @msgs], ['shuffle', shuffle(@msgs)]) {
        my $desc = shift @$msgs;
-       my $n = "index-cap-$desc";
-       run_script([qw(-init -L basic -V2), $n, "$home/$n",
-               "http://example.com/$n", "$n\@example.com"]) or
-               BAIL_OUT 'init';
-       my $ibx = PublicInbox::Config->new->lookup_name($n);
-       my $im = PublicInbox::InboxWritable->new($ibx)->importer(0);
-       for my $m (@$msgs) {
-               $im->add(PublicInbox::Eml->new("$m\nFrom: x\@example.com\n\n"));
-       }
-       $im->done;
+       my $n = "index-cap-$desc-basic";
+       # yes, the shuffle case gets memoized by create_inbox, oh well
+       my $ibx = create_inbox $desc, version => 2, indexlevel => 'basic',
+                               tmpdir => "$home/$desc", sub {
+               my ($im) = @_;
+               for my $m (@$msgs) {
+                       my $x = "$m\nFrom: x\@example.com\n\n";
+                       $im->add(PublicInbox::Eml->new(\$x));
+               }
+       };
        my $over = $ibx->over;
-       my @tid = $over->dbh->selectall_array('SELECT DISTINCT(tid) FROM over');
-       is(scalar(@tid), 1, "only one thread initially ($desc)");
+       my $dbh = $over->dbh;
+       my $tid = $dbh->selectall_arrayref('SELECT DISTINCT(tid) FROM over');
+       is(scalar(@$tid), 1, "only one thread initially ($desc)");
        $over->dbh_close;
-       run_script([qw(-index --reindex --rethread), $ibx->{inboxdir}]) or
-               BAIL_OUT 'rethread';
-       @tid = $over->dbh->selectall_array('SELECT DISTINCT(tid) FROM over');
-       is(scalar(@tid), 1, "only one thread after rethread ($desc)");
+       my $env = { HOME => $home };
+       run_script([qw(-index --no-fsync --reindex --rethread),
+                       $ibx->{inboxdir}], $env) or BAIL_OUT 'rethread';
+       $tid = $dbh->selectall_arrayref('SELECT DISTINCT(tid) FROM over');
+       is(scalar(@$tid), 1, "only one thread after rethread ($desc)");
 }
 
 done_testing;