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

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 9cde357514acbf0651fbec30ca51797d66cabd65..75698ee53c2ee744f37175d361aa28c6db5e32a7 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -5,8 +5,7 @@ use strict;
 use warnings;
 use Test::More;
 use PublicInbox::Spawn qw(which);
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 my @mods = qw(URI::Escape Plack::Builder Digest::SHA
                IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny);
 foreach my $mod (@mods) {
@@ -19,7 +18,7 @@ plan skip_all => "JSON module missing: $@" if $@;
 
 use_ok 'PublicInbox::Git';
 
-my $tmpdir = tempdir('www_listing-tmp-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $bare = PublicInbox::Git->new("$tmpdir/bare.git");
 is(system(qw(git init -q --bare), $bare->{git_dir}), 0, 'git init --bare');
 is(PublicInbox::WwwListing::fingerprint($bare), undef,
@@ -34,7 +33,7 @@ like(PublicInbox::WwwListing::fingerprint($bare), qr/\A[a-f0-9]{40}\z/,
        'got fingerprint with non-empty repo');
 
 sub tiny_test {
-       my ($host, $port) = @_;
+       my ($json, $host, $port) = @_;
        my $http = HTTP::Tiny->new;
        my $res = $http->get("http://$host:$port/manifest.js.gz");
        is($res->{status}, 200, 'got manifest');
@@ -108,7 +107,7 @@ SKIP: {
        $td = start_script($cmd, $env, { 3 => $sock });
        $sock = undef;
 
-       tiny_test($host, $port);
+       tiny_test($json, $host, $port);
 
        skip 'skipping grok-pull integration test', 2 if !which('grok-pull');