tests: move t/common.perl to PublicInbox::TestCommon

[public-inbox.git] / t / psgi_mount.t

diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index 8da2bc8937bc140a72de2c1e92a97b04f5fb6bc6..a2621a2ad3a1931e280d01a7436d4b69d8743c6a 100644 (file)
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -4,8 +4,8 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
-my $tmpdir = tempdir('psgi-path-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+my ($tmpdir, $for_destroy) = tmpdir();
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
@@ -21,10 +21,10 @@ use PublicInbox::Config;
 use PublicInbox::WWW;
 use Plack::Builder;
 use Plack::App::URLMap;
-my $config = PublicInbox::Config->new({
-       "$cfgpfx.address" => $addr,
-       "$cfgpfx.mainrepo" => $maindir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.inboxdir=$maindir
+EOF
 is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 my $git = PublicInbox::Git->new($maindir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
@@ -90,9 +90,10 @@ test_psgi($app, sub {
 SKIP: {
        my @mods = qw(DBI DBD::SQLite Search::Xapian IO::Uncompress::Gunzip);
        foreach my $mod (@mods) {
-               eval "require $mod" or skip "$mod not available: $@", 2;
+               eval "require $mod" or skip "$mod not available: $@", 3;
        }
        my $ibx = $config->lookup_name('test');
+       require_ok 'PublicInbox::SearchIdx';
        PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
        test_psgi($app, sub {
                my ($cb) = @_;