X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwww_listing.t;h=c4511cd1fed11cc46233e24b371b9d5c0f47b7f3;hb=03c9119ec613fa43dcf0a50b5f35754f13228bc8;hp=1f2929808f54c21ab1dd73ddda4a7f600608029a;hpb=3c30532aed6256a984c535530c6667552c2e6a84;p=public-inbox.git
diff --git a/t/www_listing.t b/t/www_listing.t
index 1f292980..c4511cd1 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -1,120 +1,130 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
# 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 IPC::Run Digest::SHA HTTP::Tiny
- IO::Compress::Gzip IO::Uncompress::Gunzip Net::HTTP);
-foreach my $mod (@mods) {
- eval("require $mod") or plan skip_all => "$mod missing for $0";
-}
-use_ok 'PublicInbox::WwwListing';
+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 = do {
+ no warnings 'once';
+ $PublicInbox::WwwListing::json;
+} or plan skip_all => "JSON module missing";
+
use_ok 'PublicInbox::Git';
-my $fi_data = './t/git.fast-import-data';
-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');
+PublicInbox::Import::init_bare($bare->{git_dir});
is(PublicInbox::WwwListing::fingerprint($bare), undef,
'empty repo has no fingerprint');
-
-my $cmd = [ 'git', "--git-dir=$bare->{git_dir}", qw(fast-import --quiet) ];
-ok(IPC::Run::run($cmd, '<', $fi_data), 'fast-import');
+{
+ my $fi_data = './t/git.fast-import-data';
+ 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/,
'got fingerprint with non-empty repo');
-my $pid;
-END { kill 'TERM', $pid if defined $pid };
+sub tiny_test {
+ my ($json, $host, $port) = @_;
+ my $tmp;
+ my $http = HTTP::Tiny->new;
+ my $res = $http->get("http://$host:$port/");
+ is($res->{status}, 200, 'got HTML listing');
+ like($res->{content}, qr!