X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmulti-mid.t;h=4a5b8c328507241672b16843baec13f3351756d0;hb=refs%2Fheads%2Fmaster;hp=87240c2c44855d9eed03219c00d879d476054cd0;hpb=c7acdfe78bda5bf36660a699e882e0e3c431a351;p=public-inbox.git

diff --git a/t/multi-mid.t b/t/multi-mid.t
index 87240c2c..4a5b8c32 100644
--- a/t/multi-mid.t
+++ b/t/multi-mid.t
@@ -1,17 +1,16 @@
-# 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 Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::TestCommon;
-use PublicInbox::InboxWritable;
 require_git(2.6);
 require_mods(qw(DBD::SQLite));
 require PublicInbox::SearchIdx;
-my $delay = $ENV{TEST_DELAY_CONVERT};
+my $delay = $ENV{TEST_DELAY_CONVERT} // '';
 
 my $addr = 'test@example.com';
-my $bad = PublicInbox::MIME->new(<<EOF);
+my $bad = PublicInbox::Eml->new(<<EOF);
 Message-ID: <a\@example.com>
 Message-ID: <b\@example.com>
 From: a\@example.com
@@ -20,7 +19,7 @@ Subject: bad
 
 EOF
 
-my $good = PublicInbox::MIME->new(<<EOF);
+my $good = PublicInbox::Eml->new(<<EOF);
 Message-ID: <b\@example.com>
 From: b\@example.com
 To: $addr
@@ -28,34 +27,25 @@ Subject: good
 
 EOF
 
+my $nr = 0;
 for my $order ([$bad, $good], [$good, $bad]) {
-	my $before;
 	my ($tmpdir, $for_destroy) = tmpdir();
-	my $ibx = PublicInbox::InboxWritable->new({
-		inboxdir => "$tmpdir/v1",
-		name => 'test-v1',
-		indexlevel => 'basic',
-		-primary_address => $addr,
-	}, my $creat_opt = {});
-	my @old;
-	if ('setup v1 inbox') {
-		my $im = $ibx->importer(0);
-		for (@$order) {
-			ok($im->add($_), 'added '.$_->header('Subject'));
+	my $ibx = create_inbox "test$delay.$nr", indexlevel => 'basic', sub {
+		my ($im) = @_;
+		for my $eml (@$order) {
+			$im->add($eml) or BAIL_OUT;
 			sleep($delay) if $delay;
 		}
-		$im->done;
-		my $s = PublicInbox::SearchIdx->new($ibx, 1);
-		$s->index_sync;
-		$before = [ $ibx->mm->minmax ];
-		@old = ($ibx->over->get_art(1), $ibx->over->get_art(2));
-		$ibx->cleanup;
-	}
+	};
+	++$nr;
+	my $before = [ $ibx->mm->minmax ];
+	my @old = ($ibx->over->get_art(1), $ibx->over->get_art(2));
+	$ibx->cleanup;
 	my $rdr = { 1 => \(my $out = ''), 2 => \(my $err = '') };
 	my $cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/v2" ];
 	my $env = { PI_DIR => "$tmpdir/.public-inbox" };
 	ok(run_script($cmd, $env, $rdr), 'convert to v2');
-	$err =~ s!\AW: $tmpdir/v1 not configured[^\n]+\n!!s;
+	$err =~ s!\AW: \Q$ibx->{inboxdir}\E not configured[^\n]+\n!!s;
 	is($err, '', 'no errors or warnings from -convert');
 	$ibx->{version} = 2;
 	$ibx->{inboxdir} = "$tmpdir/v2";
@@ -65,12 +55,12 @@ for my $order ([$bad, $good], [$good, $bad]) {
 	my @v2 = ($ibx->over->get_art(1), $ibx->over->get_art(2));
 	is_deeply(\@v2, \@old, 'v2 conversion times match');
 
-	system(qw(git clone -sq --mirror), "$tmpdir/v2/git/0.git",
+	xsys(qw(git clone -sq --mirror), "$tmpdir/v2/git/0.git",
 		"$tmpdir/v2-clone/git/0.git") == 0 or die "clone: $?";
-	$cmd = [ '-init', '-V2', 'v2c', "$tmpdir/v2-clone",
+	$cmd = [ '-init', '-Lbasic', '-V2', 'v2c', "$tmpdir/v2-clone",
 		'http://example.com/v2c', 'v2c@example.com' ];
 	ok(run_script($cmd, $env), 'init clone');
-	$cmd = [ '-index', "$tmpdir/v2-clone" ];
+	$cmd = [ qw(-index -j0), "$tmpdir/v2-clone" ];
 	sleep($delay) if $delay;
 	ok(run_script($cmd, $env), 'index the clone');
 	$ibx->cleanup;