xt/mem-imapd-tls: update aliases to DSdeflate subs

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 6b3b408fae413f498fba880b10321e493765e780..c556a2d72aeb1c8d887c93103e2828141949e872 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -2,11 +2,7 @@
 # Copyright (C) 2019-2021 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 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));
@@ -55,7 +51,7 @@ sub tiny_test {
        ok(my $clone = $manifest->{'/alt'}, '/alt in manifest');
        is($clone->{owner}, "lorelei \x{100}", 'owner set');
        is($clone->{reference}, '/bare', 'reference detected');
-       is($clone->{description}, "we're all clones", 'description read');
+       is($clone->{description}, "we're \x{100}ll clones", 'description read');
        ok(my $bare = $manifest->{'/bare'}, '/bare in manifest');
        is($bare->{description}, 'Unnamed repository',
                'missing $GIT_DIR/description fallback');
@@ -72,6 +68,10 @@ sub tiny_test {
        ok(my $v2epoch1 = $manifest->{'/v2/git/1.git'}, 'v2 epoch 1 appeared');
        like($v2epoch1->{description}, qr/ \[epoch 1\]\z/,
                'epoch 1 in description');
+
+       $res = $http->get("http://$host:$port/alt/description");
+       is($res->{content}, "we're \xc4\x80ll clones\n", 'UTF-8 description')
+               or diag explain($res);
 }
 
 my $td;
@@ -91,13 +91,12 @@ SKIP: {
                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;
+       open $fh, '>', "$alt/description" or xbail "open $alt/description $!";
+       print $fh "we're \xc4\x80ll clones\n" or xbail "print $!";
+       close $fh or xbail "write: $alt/description $!";
        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 xbail "open $cfgfile: $!";
        $fh->autoflush(1);
        print $fh <<"" or xbail "print $!";
@@ -131,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)) {
@@ -160,24 +163,33 @@ 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');
        for (qw(v2/git/0.git v2/git/1.git v2/git/2.git)) {
                ok(-d "$tmpdir/per-inbox/$_", "grok-pull created $_");
        }
+       $td->kill;
+       $td->join;
+       is($?, 0, 'no error in exited process');
+       open $fh, '<', $err or BAIL_OUT("open $err failed: $!");
+       my $eout = do { local $/; <$fh> };
+       unlike($eout, qr/wide/i, 'no Wide character warnings');
+       unlike($eout, qr/uninitialized/i, 'no uninitialized warnings');
 }
 
 done_testing();