X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwww_listing.t;h=c556a2d72aeb1c8d887c93103e2828141949e872;hb=b5454f38b1903735594e3c253617a66dd267062f;hp=5f90139af65bd63f4bd1b667b1d03548c9ae6a5a;hpb=9626c1a6b368dc09425c1d578ba9ce4efc1af9fc;p=public-inbox.git
diff --git a/t/www_listing.t b/t/www_listing.t
index 5f90139a..c556a2d7 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -2,11 +2,7 @@
# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
# manifest.js.gz generation and grok-pull integration test
-use strict;
-use v5.10.1;
-use Test::More;
-use PublicInbox::Spawn qw(which);
-use PublicInbox::TestCommon;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use PublicInbox::Import;
use IO::Uncompress::Gunzip qw(gunzip);
require_mods(qw(json URI::Escape Plack::Builder Digest::SHA HTTP::Tiny));
@@ -134,27 +130,31 @@ SKIP: {
tiny_test($json, $host, $port, 1);
undef $sock;
- my $grok_pull = which('grok-pull') or
+ skip 'TEST_GROK unset', 12 unless $ENV{TEST_GROK};
+ my $grok_pull = require_cmd('grok-pull', 1) or
skip('grok-pull not available', 12);
my ($grok_version) = (xqx([$grok_pull, "--version"])
=~ /(\d+)\.(?:\d+)(?:\.(\d+))?/);
$grok_version >= 2 or
skip('grok-pull v2 or later not available', 12);
+ my $grok_loglevel = $ENV{TEST_GROK_LOGLEVEL} // 'info';
ok(mkdir("$tmpdir/mirror"), 'prepare grok mirror dest');
- open $fh, '>', "$tmpdir/repos.conf" or die;
- print $fh <<"" or die;
+ my $tail = tail_f("$tmpdir/grok.log");
+ open $fh, '>', "$tmpdir/repos.conf" or xbail $!;
+ print $fh <<"" or xbail $!;
[core]
toplevel = $tmpdir/mirror
manifest = $tmpdir/local-manifest.js.gz
+log = $tmpdir/grok.log
+loglevel = $grok_loglevel
[remote]
site = http://$host:$port
manifest = \${site}/manifest.js.gz
[pull]
[fsck]
- close $fh or die;
-
+ close $fh or xbail $!;
xsys($grok_pull, '-c', "$tmpdir/repos.conf");
is($? >> 8, 0, 'grok-pull exit code as expected');
for (qw(alt bare v2/git/0.git v2/git/1.git v2/git/2.git)) {
@@ -163,18 +163,20 @@ manifest = \${site}/manifest.js.gz
# support per-inbox manifests, handy for v2:
# /$INBOX/v2/manifest.js.gz
- open $fh, '>', "$tmpdir/per-inbox.conf" or die;
- print $fh <<"" or die;
+ open $fh, '>', "$tmpdir/per-inbox.conf" or xbail $!;
+ print $fh <<"" or xbail $!;
[core]
toplevel = $tmpdir/per-inbox
manifest = $tmpdir/per-inbox-manifest.js.gz
+log = $tmpdir/grok.log
+loglevel = $grok_loglevel
[remote]
site = http://$host:$port
manifest = \${site}/v2/manifest.js.gz
[pull]
[fsck]
- close $fh or die;
+ close $fh or xbail $!;
ok(mkdir("$tmpdir/per-inbox"), 'prepare single-v2-inbox mirror');
xsys($grok_pull, '-c', "$tmpdir/per-inbox.conf");
is($? >> 8, 0, 'grok-pull exit code as expected');