testcommon: spawn-aware system() and qx[] workalikes

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 2ff053dedd01bfd0a605b2b698f8556f2c9bed8b..31d76356d886697093a099129fddf22e1b5e50ad 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -1,4 +1,4 @@
-# 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>
 # manifest.js.gz generation and grok-pull integration test
 use strict;
@@ -6,23 +6,28 @@ use warnings;
 use Test::More;
 use PublicInbox::Spawn qw(which);
 use PublicInbox::TestCommon;
+use PublicInbox::Import;
 require_mods(qw(URI::Escape Plack::Builder Digest::SHA
                IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny));
 require PublicInbox::WwwListing;
-my $json = eval { PublicInbox::WwwListing::_json() };
-plan skip_all => "JSON module missing: $@" if $@;
+my $json = do {
+       no warnings 'once';
+       $PublicInbox::WwwListing::json;
+} or plan skip_all => "JSON module missing";
 
 use_ok 'PublicInbox::Git';
 
 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');
+PublicInbox::Import::init_bare($bare->{git_dir});
 is(PublicInbox::WwwListing::fingerprint($bare), undef,
        'empty repo has no fingerprint');
 {
        my $fi_data = './t/git.fast-import-data';
-       local $ENV{GIT_DIR} = $bare->{git_dir};
-       is(system("git fast-import --quiet <$fi_data"), 0, 'fast-import');
+       open my $fh, '<', $fi_data or die "open $fi_data: $!";
+       my $env = { GIT_DIR => $bare->{git_dir} };
+       is(xsys([qw(git fast-import --quiet)], $env, { 0 => $fh }), 0,
+               'fast-import');
 }
 
 like(PublicInbox::WwwListing::fingerprint($bare), qr/\A[a-f0-9]{40}\z/,
@@ -31,7 +36,10 @@ like(PublicInbox::WwwListing::fingerprint($bare), qr/\A[a-f0-9]{40}\z/,
 sub tiny_test {
        my ($json, $host, $port) = @_;
        my $http = HTTP::Tiny->new;
-       my $res = $http->get("http://$host:$port/manifest.js.gz");
+       my $res = $http->get("http://$host:$port/");
+       is($res->{status}, 200, 'got HTML listing');
+       like($res->{content}, qr!</html>!si, 'listing looks like HTML');
+       $res = $http->get("http://$host:$port/manifest.js.gz");
        is($res->{status}, 200, 'got manifest');
        my $tmp;
        IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp);
@@ -70,21 +78,23 @@ SKIP: {
        ok($sock, 'sock created');
        my ($host, $port) = ($sock->sockhost, $sock->sockport);
        my @clone = qw(git clone -q -s --bare);
-       is(system(@clone, $bare->{git_dir}, $alt), 0, 'clone shared repo');
+       is(xsys(@clone, $bare->{git_dir}, $alt), 0, 'clone shared repo');
 
-       system(qw(git init --bare -q), "$v2/all.git") == 0 or die;
+       PublicInbox::Import::init_bare("$v2/all.git");
        for my $i (0..2) {
-               is(system(@clone, $alt, "$v2/git/$i.git"), 0, "clone epoch $i");
+               is(xsys(@clone, $alt, "$v2/git/$i.git"), 0, "clone epoch $i")
        }
        ok(open(my $fh, '>', "$v2/inbox.lock"), 'mock a v2 inbox');
        open $fh, '>', "$alt/description" or die;
        print $fh "we're all clones\n" or die;
        close $fh or die;
-       is(system('git', "--git-dir=$alt", qw(config gitweb.owner lorelei)), 0,
+       is(xsys('git', "--git-dir=$alt", qw(config gitweb.owner lorelei)), 0,
                'set gitweb user');
        ok(unlink("$bare->{git_dir}/description"), 'removed bare/description');
        open $fh, '>', $cfgfile or die;
        print $fh <<"" or die;
+[publicinbox]
+       wwwlisting = all
 [publicinbox "bare"]
        inboxdir = $bare->{git_dir}
        url = http://$host/bare
@@ -106,7 +116,8 @@ SKIP: {
 
        tiny_test($json, $host, $port);
 
-       skip 'skipping grok-pull integration test', 2 if !which('grok-pull');
+       my $grok_pull = which('grok-pull') or
+               skip('skipping grok-pull integration test', 2);
 
        ok(mkdir("$tmpdir/mirror"), 'prepare grok mirror dest');
        open $fh, '>', "$tmpdir/repos.conf" or die;
@@ -121,7 +132,7 @@ mymanifest = $tmpdir/local-manifest.js.gz
 
        close $fh or die;
 
-       system(qw(grok-pull -c), "$tmpdir/repos.conf");
+       xsys($grok_pull, '-c', "$tmpdir/repos.conf");
        is($? >> 8, 127, 'grok-pull exit code as expected');
        for (qw(alt bare v2/git/0.git v2/git/1.git v2/git/2.git)) {
                ok(-d "$tmpdir/mirror/$_", "grok-pull created $_");
@@ -141,7 +152,7 @@ mymanifest = $tmpdir/per-inbox-manifest.js.gz
 
        close $fh or die;
        ok(mkdir("$tmpdir/per-inbox"), 'prepare single-v2-inbox mirror');
-       system(qw(grok-pull -c), "$tmpdir/per-inbox.conf");
+       xsys($grok_pull, '-c', "$tmpdir/per-inbox.conf");
        is($? >> 8, 127, 'grok-pull exit code as expected');
        for (qw(v2/git/0.git v2/git/1.git v2/git/2.git)) {
                ok(-d "$tmpdir/per-inbox/$_", "grok-pull created $_");