clone: support multi-inbox clone

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

diff --git a/t/www_listing.t b/t/www_listing.t
index 7ea12eea3712e292feed1b55b70b0852aded4d1a..e88bfbc5b003690f23e31d3888b02ec3787dcd39 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -1,12 +1,8 @@
 #!perl -w
-# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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));
@@ -101,7 +97,6 @@ SKIP: {
        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 $!";
@@ -120,10 +115,38 @@ SKIP: {
 
        my $env = { PI_CONFIG => $cfgfile };
        my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       my $psgi = "$tmpdir/pfx.psgi";
+       {
+               open my $psgi_fh, '>', $psgi or xbail "open: $!";
+               print $psgi_fh <<'EOM' or xbail "print $!";
+use PublicInbox::WWW;
+use Plack::Builder;
+my $www = PublicInbox::WWW->new;
+builder {
+       enable 'Head';
+       mount '/pfx/' => sub { $www->call(@_) }
+}
+EOM
+               close $psgi_fh or xbail "close: $!";
+       }
+
+       # ensure prefixed mount full clones work:
+       $td = start_script([@$cmd, $psgi], $env, { 3 => $sock });
+       my $opt = { 2 => \(my $clone_err = '') };
+       ok(run_script(['-clone', "http://$host:$port/pfx", "$tmpdir/pfx" ],
+               undef, $opt), 'pfx clone w/pfx') or diag "clone_err=$clone_err";
+       undef $td;
+
        $td = start_script($cmd, $env, { 3 => $sock });
 
        # default publicinboxGrokManifest match=domain default
        tiny_test($json, $host, $port);
+
+       # normal full clone on /
+       $clone_err = '';
+       ok(run_script(['-clone', "http://$host:$port/", "$tmpdir/full" ],
+               undef, $opt), 'full clone') or diag "clone_err=$clone_err";
+
        undef $td;
 
        print $fh <<"" or xbail "print $!";
@@ -132,30 +155,36 @@ SKIP: {
 
        close $fh or xbail "close $!";
        $td = start_script($cmd, $env, { 3 => $sock });
-       tiny_test($json, $host, $port, 1);
        undef $sock;
+       tiny_test($json, $host, $port, 1);
 
-       my $grok_pull = which('grok-pull') or
+       # grok-pull sleeps a long while some places:
+       # https://lore.kernel.org/tools/20211013110344.GA10632@dcvr/
+       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)) {
@@ -164,18 +193,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');