X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwww_listing.t;h=c556a2d72aeb1c8d887c93103e2828141949e872;hb=refs%2Fheads%2Fmaster;hp=e88bfbc5b003690f23e31d3888b02ec3787dcd39;hpb=d922fc44d1afb5e4400f2606c475e42aee087c24;p=public-inbox.git diff --git a/t/www_listing.t b/t/www_listing.t index e88bfbc5..4784c39d 100644 --- a/t/www_listing.t +++ b/t/www_listing.t @@ -5,7 +5,7 @@ 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)); +require_mods(qw(json URI::Escape Plack::Builder HTTP::Tiny)); require PublicInbox::WwwListing; require PublicInbox::ManifestJsGz; use PublicInbox::Config; @@ -91,6 +91,10 @@ 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, '>', "$v2/description") or xbail "open $v2/description: $!"; + print $fh "a v2 inbox\n" or xbail "print $!"; + close $fh or xbail "write: $v2/description $!"; + 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 $!"; @@ -135,8 +139,40 @@ EOM 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"; + + open my $mh, '<', "$tmpdir/pfx/manifest.js.gz" or xbail "open: $!"; + gunzip(\(do { local $/; <$mh> }) => \(my $mjs = '')); + my $mf = $json->decode($mjs); + is_deeply([sort keys %$mf], [ qw(/alt /bare /v2/git/0.git + /v2/git/1.git /v2/git/2.git) ], + 'manifest saved'); + for (keys %$mf) { ok(-d "$tmpdir/pfx$_", "pfx/$_ cloned") } + open my $desc, '<', "$tmpdir/pfx/v2/description" or xbail "open: $!"; + $desc = <$desc>; + is($desc, "a v2 inbox\n", 'v2 description retrieved'); + + $clone_err = ''; + ok(run_script(['-clone', '--include=*/alt', + "http://$host:$port/pfx", "$tmpdir/incl" ], + undef, $opt), 'clone w/include') or diag "clone_err=$clone_err"; + ok(-d "$tmpdir/incl/alt", 'alt cloned'); + ok(!-d "$tmpdir/incl/v2" && !-d "$tmpdir/incl/bare", 'only alt cloned'); + is(xqx([qw(git config -f), "$tmpdir/incl/alt/config", 'gitweb.owner']), + "lorelei \xc4\x80\n", 'gitweb.owner set by -clone'); + + $clone_err = ''; + ok(run_script(['-clone', '--dry-run', + "http://$host:$port/pfx", "$tmpdir/dry-run" ], + undef, $opt), 'clone --dry-run') or diag "clone_err=$clone_err"; + ok(!-d "$tmpdir/dry-run", 'nothing cloned with --dry-run'); + undef $td; + open $mh, '<', "$tmpdir/incl/manifest.js.gz" or xbail "open: $!"; + gunzip(\(do { local $/; <$mh> }) => \($mjs = '')); + $mf = $json->decode($mjs); + is_deeply([keys %$mf], [ '/alt' ], 'excluded keys skipped in manifest'); + $td = start_script($cmd, $env, { 3 => $sock }); # default publicinboxGrokManifest match=domain default @@ -146,6 +182,7 @@ EOM $clone_err = ''; ok(run_script(['-clone', "http://$host:$port/", "$tmpdir/full" ], undef, $opt), 'full clone') or diag "clone_err=$clone_err"; + ok(-d "$tmpdir/full/$_", "$_ cloned") for qw(alt v2 bare); undef $td;