X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_scan_all.t;h=c8cb2409985e944adef2e292e78ad03b6e68247d;hb=6e2da35b9e9e5510e3156b07e91ebc835146758c;hp=2e00b6d843160e43391f2d54b8dc5227f181b42f;hpb=356e1db5135802ed468719dfcd1f1c3f9dba9fff;p=public-inbox.git

diff --git a/t/psgi_scan_all.t b/t/psgi_scan_all.t
index 2e00b6d8..c8cb2409 100644
--- a/t/psgi_scan_all.t
+++ b/t/psgi_scan_all.t
@@ -1,30 +1,28 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Email::MIME;
-use File::Temp qw/tempdir/;
+use PublicInbox::Eml;
 use PublicInbox::Config;
+use PublicInbox::TestCommon;
 my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape DBD::SQLite);
-foreach my $mod (@mods) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for psgi_scan_all.t" if $@;
-}
+require_git 2.6;
+require_mods(@mods);
 use_ok 'PublicInbox::V2Writable';
 foreach my $mod (@mods) { use_ok $mod; }
-my $tmp = tempdir('pi-scan_all-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmp, $for_destroy) = tmpdir();
 my $cfg = '';
 
 foreach my $i (1..2) {
 	my $cfgpfx = "publicinbox.test-$i";
 	my $addr = "test-$i\@example.com";
-	my $mainrepo = "$tmp/$i";
+	my $inboxdir = "$tmp/$i";
 	$cfg .= "$cfgpfx.address=$addr\n";
-	$cfg .= "$cfgpfx.mainrepo=$mainrepo\n";
+	$cfg .= "$cfgpfx.inboxdir=$inboxdir\n";
 	$cfg .= "$cfgpfx.url=http://example.com/$i\n";
 	my $opt = {
-		mainrepo => $mainrepo,
+		inboxdir => $inboxdir,
 		name => "test-$i",
 		version => 2,
 		indexlevel => 'basic',
@@ -34,7 +32,7 @@ foreach my $i (1..2) {
 	my $im = PublicInbox::V2Writable->new($ibx, 1);
 	$im->{parallel} = 0;
 	$im->init_inbox(0);
-	my $mime = PublicInbox::MIME->new(<<EOF);
+	my $mime = PublicInbox::Eml->new(<<EOF);
 From: a\@example.com
 To: $addr
 Subject: s$i