X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwww_listing.t;h=4309a5e17ba24e176409937b21e7475e95a65ed1;hb=de9648ca847cf032aab6da9cac1217bf9cca9c90;hp=9cde357514acbf0651fbec30ca51797d66cabd65;hpb=e05912ae3899a0f50a6baf3b6c1892789d24f6b1;p=public-inbox.git diff --git a/t/www_listing.t b/t/www_listing.t index 9cde3575..4309a5e1 100644 --- a/t/www_listing.t +++ b/t/www_listing.t @@ -1,49 +1,59 @@ -# 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 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; +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 $@; +require PublicInbox::ManifestJsGz; +my $json = do { + no warnings 'once'; + $PublicInbox::ManifestJsGz::json; +} or plan skip_all => "JSON module missing"; 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, +PublicInbox::Import::init_bare($bare->{git_dir}); +is(PublicInbox::ManifestJsGz::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/, +like(PublicInbox::ManifestJsGz::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 $tmp; 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!!si, 'listing looks like HTML'); + + $res = $http->get("http://$host:$port/", {'Accept-Encoding'=>'gzip'}); + is($res->{status}, 200, 'got gzipped HTML listing'); + IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp); + like($tmp, qr!!si, 'unzipped 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); unlike($tmp, qr/"modified":\s*"/, 'modified is an integer'); my $manifest = $json->decode($tmp); ok(my $clone = $manifest->{'/alt'}, '/alt in manifest'); - is($clone->{owner}, 'lorelei', 'owner set'); + is($clone->{owner}, "lorelei \x{100}", 'owner set'); is($clone->{reference}, '/bare', 'reference detected'); is($clone->{description}, "we're all clones", 'description read'); ok(my $bare = $manifest->{'/bare'}, '/bare in manifest'); @@ -75,20 +85,24 @@ 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'); + 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 \xc4\x80"), 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 @@ -108,9 +122,10 @@ 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'); + 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; @@ -125,7 +140,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 $_"); @@ -145,7 +160,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 $_");