-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# 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 warnings;
-use Test::More;
-use PublicInbox::Spawn qw(which);
-use PublicInbox::TestCommon;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use PublicInbox::Import;
-require_mods(qw(json URI::Escape Plack::Builder Digest::SHA
- IO::Compress::Gzip IO::Uncompress::Gunzip HTTP::Tiny));
+use IO::Uncompress::Gunzip qw(gunzip);
+require_mods(qw(json URI::Escape Plack::Builder Digest::SHA HTTP::Tiny));
require PublicInbox::WwwListing;
require PublicInbox::ManifestJsGz;
use PublicInbox::Config;
'got fingerprint with non-empty repo');
sub tiny_test {
- my ($json, $host, $port) = @_;
- my $tmp;
+ my ($json, $host, $port, $html) = @_;
+ my ($tmp, $res);
my $http = HTTP::Tiny->new;
- my $res = $http->get("http://$host:$port/");
- is($res->{status}, 200, 'got HTML listing');
- like($res->{content}, qr!</html>!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!</html>!si, 'unzipped listing looks like HTML');
-
+ if ($html) {
+ $res = $http->get("http://$host:$port/");
+ is($res->{status}, 200, 'got HTML listing');
+ like($res->{content}, qr!</html>!si, 'listing looks like HTML');
+
+ $res = $http->get("http://$host:$port/",
+ {'Accept-Encoding'=>'gzip'});
+ is($res->{status}, 200, 'got gzipped HTML listing');
+ gunzip(\(delete $res->{content}) => \$tmp);
+ like($tmp, qr!</html>!si, 'unzipped listing looks like HTML');
+ }
$res = $http->get("http://$host:$port/manifest.js.gz");
is($res->{status}, 200, 'got manifest');
- IO::Uncompress::Gunzip::gunzip(\(delete $res->{content}) => \$tmp);
+ 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 \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');
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;
my $cfgfile = "$tmpdir/config";
my $v2 = "$tmpdir/v2";
my $sock = tcp_server();
- ok($sock, 'sock created');
- my ($host, $port) = ($sock->sockhost, $sock->sockport);
+ my ($host, $port) = tcp_host_port($sock);
my @clone = qw(git clone -q -s --bare);
is(xsys(@clone, $bare->{git_dir}, $alt), 0, 'clone shared repo');
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 die;
- print $fh <<"" or die;
-[publicinbox]
- wwwlisting = all
+ open $fh, '>', $cfgfile or xbail "open $cfgfile: $!";
+ $fh->autoflush(1);
+ print $fh <<"" or xbail "print $!";
[publicinbox "bare"]
inboxdir = $bare->{git_dir}
url = http://$host/bare
url = http://$host/v2
address = v2\@example.com
- close $fh or die;
my $env = { PI_CONFIG => $cfgfile };
my $cmd = [ '-httpd', '-W0', "--stdout=$out", "--stderr=$err" ];
$td = start_script($cmd, $env, { 3 => $sock });
- $sock = undef;
+ # default publicinboxGrokManifest match=domain default
tiny_test($json, $host, $port);
+ undef $td;
- my $grok_pull = which('grok-pull') or
- skip('skipping grok-pull integration test', 2);
+ print $fh <<"" or xbail "print $!";
+[publicinbox]
+ wwwlisting = all
+
+ close $fh or xbail "close $!";
+ $td = start_script($cmd, $env, { 3 => $sock });
+ tiny_test($json, $host, $port, 1);
+ undef $sock;
+
+ 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;
-# You can pull from multiple grok mirrors, just create
-# a separate section for each mirror. The name can be anything.
-[test]
-site = http://$host:$port
-manifest = http://$host:$port/manifest.js.gz
+ my $tail = tail_f("$tmpdir/grok.log");
+ open $fh, '>', "$tmpdir/repos.conf" or xbail $!;
+ print $fh <<"" or xbail $!;
+[core]
toplevel = $tmpdir/mirror
-mymanifest = $tmpdir/local-manifest.js.gz
-
- close $fh or die;
+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 xbail $!;
xsys($grok_pull, '-c', "$tmpdir/repos.conf");
- is($? >> 8, 127, 'grok-pull exit code as expected');
+ 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)) {
ok(-d "$tmpdir/mirror/$_", "grok-pull created $_");
}
# support per-inbox manifests, handy for v2:
# /$INBOX/v2/manifest.js.gz
- open $fh, '>', "$tmpdir/per-inbox.conf" or die;
- print $fh <<"" or die;
-# You can pull from multiple grok mirrors, just create
-# a separate section for each mirror. The name can be anything.
-[v2]
-site = http://$host:$port
-manifest = http://$host:$port/v2/manifest.js.gz
+ open $fh, '>', "$tmpdir/per-inbox.conf" or xbail $!;
+ print $fh <<"" or xbail $!;
+[core]
toplevel = $tmpdir/per-inbox
-mymanifest = $tmpdir/per-inbox-manifest.js.gz
+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, 127, 'grok-pull exit code as expected');
+ 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();