treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 3d1b64ad4beea427592dfe29c5df5eb5ec622122..5168e16ad90b9dd28d367e653d36ade86b1896f8 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -1,25 +1,20 @@
-# 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;
 use warnings;
 use Test::More;
 use PublicInbox::Spawn qw(which);
-use File::Temp qw/tempdir/;
-require './t/common.perl';
-my @mods = qw(URI::Escape Plack::Builder Digest::SHA
-               IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny);
-foreach my $mod (@mods) {
-       eval("require $mod") or plan skip_all => "$mod missing for $0";
-}
-
+use PublicInbox::TestCommon;
+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 $@;
 
 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,9 +29,12 @@ 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");
+       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);
@@ -64,21 +62,20 @@ sub tiny_test {
                'epoch 1 in description');
 }
 
-my $pid;
-END { kill 'TERM', $pid if defined $pid };
+my $td;
 SKIP: {
        my $err = "$tmpdir/stderr.log";
        my $out = "$tmpdir/stdout.log";
        my $alt = "$tmpdir/alt.git";
        my $cfgfile = "$tmpdir/config";
        my $v2 = "$tmpdir/v2";
-       my $httpd = 'blib/script/public-inbox-httpd';
        my $sock = tcp_server();
        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');
 
+       system(qw(git init --bare -q), "$v2/all.git") == 0 or die;
        for my $i (0..2) {
                is(system(@clone, $alt, "$v2/git/$i.git"), 0, "clone epoch $i");
        }
@@ -91,6 +88,8 @@ SKIP: {
        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,11 +105,11 @@ SKIP: {
 
        close $fh or die;
        my $env = { PI_CONFIG => $cfgfile };
-       my $cmd = [ $httpd, "--stdout=$out", "--stderr=$err" ];
-       $pid = spawn_listener($env, $cmd, [$sock]);
+       my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       $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');