testcommon: add require_mods method and use it

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

diff --git a/t/plack.t b/t/plack.t
index 7e65ad742e8f03ccc9102668fb1b3d09a5a5b37f..f0dc4bbb515777299d437d13ec801f6494fdf94f 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -4,18 +4,15 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
+use PublicInbox::TestCommon;
 my $psgi = "./examples/public-inbox.psgi";
-my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $pi_config = "$tmpdir/config";
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
 my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for plack.t" if $@;
-}
+require_mods(@mods);
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Git';
 my @ls;
@@ -54,9 +51,9 @@ EOF
                my $im = PublicInbox::Import->new($git, 'test', $addr);
                $im->add($mime);
                $im->done;
-               my $rev = `git --git-dir="$maindir" rev-list HEAD`;
+               my $rev = $git->qx(qw(rev-list HEAD));
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
-               @ls = `git --git-dir="$maindir" ls-tree -r --name-only HEAD`;
+               @ls = $git->qx(qw(ls-tree -r --name-only HEAD));
                chomp @ls;
        }
        my $app = eval {