X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fthread-index-gap.t;h=15c362f031be8b08b529874aa39cef744fe9c240;hb=refs%2Fheads%2Fmaster;hp=f4e4bd09c3ad3228519e6565be9e78bd09f63df6;hpb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;p=public-inbox.git

diff --git a/t/thread-index-gap.t b/t/thread-index-gap.t
index f4e4bd09..15c362f0 100644
--- a/t/thread-index-gap.t
+++ b/t/thread-index-gap.t
@@ -3,10 +3,8 @@
 # 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;