X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_scan_all.t;h=93603a332819a4a9dc62287ff74a429483762cb3;hb=e39585ee2bdcbeaab7b6bd33b3568021042d0879;hp=e9c439ec6b0e8e7bab0ec6afa41dbf4fe97ed921;hpb=98661e7894ae4b516d7b7a9d87e451ef2bfe57ba;p=public-inbox.git
diff --git a/t/psgi_scan_all.t b/t/psgi_scan_all.t
index e9c439ec..93603a33 100644
--- a/t/psgi_scan_all.t
+++ b/t/psgi_scan_all.t
@@ -1,31 +1,30 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use Email::MIME;
-use File::Temp qw/tempdir/;
+use PublicInbox::MIME;
use PublicInbox::Config;
-my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape Search::Xapian
- DBD::SQLite);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for psgi_scan_all.t" if $@;
-}
+use PublicInbox::TestCommon;
+my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape DBD::SQLite);
+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 $cfg = {};
+my ($tmp, $for_destroy) = tmpdir();
+my $cfg = '';
foreach my $i (1..2) {
my $cfgpfx = "publicinbox.test-$i";
- my $addr = $cfg->{"$cfgpfx.address"} = "test-$i\@example.com";
- my $mainrepo = $cfg->{"$cfgpfx.mainrepo"} = "$tmp/$i";
- $cfg->{"$cfgpfx.url"} = "http://example.com/$i";
+ my $addr = "test-$i\@example.com";
+ my $inboxdir = "$tmp/$i";
+ $cfg .= "$cfgpfx.address=$addr\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',
-primary_address => $addr,
};
my $ibx = PublicInbox::Inbox->new($opt);
@@ -45,7 +44,7 @@ EOF
ok($im->add($mime), "added message to $i");
$im->done;
}
-my $config = PublicInbox::Config->new($cfg);
+my $config = PublicInbox::Config->new(\$cfg);
use_ok 'PublicInbox::WWW';
my $www = PublicInbox::WWW->new($config);