X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2mirror.t;h=37d64e83e53bff264bbc04a5eb4d5f22889b5d1c;hb=refs%2Fheads%2Fmaster;hp=1231b72df0b7a2e7c5ba8b73eab2198264a6d9ae;hpb=3596019278ef489f27e0659c752977f60f847903;p=public-inbox.git diff --git a/t/v2mirror.t b/t/v2mirror.t index 1231b72d..c1c66d45 100644 --- a/t/v2mirror.t +++ b/t/v2mirror.t @@ -1,14 +1,16 @@ -# Copyright (C) 2018-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ use strict; use v5.10.1; use PublicInbox::TestCommon; use File::Path qw(remove_tree make_path); use Cwd qw(abs_path); +use Carp (); use PublicInbox::Spawn qw(which); require_git(2.6); require_cmd('curl'); local $ENV{HOME} = abs_path('t'); +use IO::Uncompress::Gunzip qw(gunzip $GunzipError); # Integration tests for HTTP cloning + mirroring require_mods(qw(Plack::Util Plack::Builder @@ -101,7 +103,9 @@ my @new_epochs; my $fetch_each_epoch = sub { my %before = map { $_ => 1 } glob("$tmpdir/m/git/*"); run_script([qw(-fetch --exit-code -q)], undef, {-C => "$tmpdir/m"}) or - xbail '-fetch fail'; + xbail('-fetch fail ', + [ xqx([which('find'), "$tmpdir/m", qw(-type f -ls) ]) ], + Carp::longmess()); is($?, 0, '--exit-code 0 after fetch updated'); my @after = grep { !$before{$_} } glob("$tmpdir/m/git/*"); push @new_epochs, @after; @@ -272,6 +276,10 @@ if ('test read-only epoch dirs') { my @g = glob("$dst/git/*.git"); my @w = grep { -w $_ } @g; my @r = grep { ! -w $_ } @g; + if ($> == 0) { + @w = grep { (stat($_))[2] & 0200 } @g; + @r = grep { !((stat($_))[2] & 0200) } @g; + } is(scalar(@w), 1, 'one writable directory'); my ($w) = ($w[0] =~ m!/([0-9]+)\.git\z!); is((grep { @@ -286,28 +294,54 @@ if ('test read-only epoch dirs') { "http://$host:$port/v2/", $dst]); my @g2 = glob("$dst/git/*.git") ; is_deeply(\@g2, \@g, 'cloned again'); - is(scalar(grep { -w $_ } @g2), scalar(@w) + 1, + is(scalar(grep { (stat($_))[2] & 0200 } @g2), scalar(@w) + 1, 'got one more cloned epoch'); + + # make 0.git writable and fetch into it, relies on culled manifest + chmod(0755, $g2[0]) or xbail "chmod: $!"; + my @before = glob("$g2[0]/objects/*/*"); + run_script([qw(-fetch -q)], undef, { -C => $dst }); + is($?, 0, 'no error from partial fetch'); + my @after = glob("$g2[0]/objects/*/*"); + ok(scalar(@before) < scalar(@after), 'fetched after chmod 0755 0.git'); + + # ensure culled manifest is maintained after fetch + gunzip("$dst/manifest.js.gz" => \(my $m), MultiStream => 1) or + xbail "gunzip: $GunzipError"; + $m = PublicInbox::Config->json->decode($m); + for my $k (keys %$m) { # /$name/git/$N.git + my ($nr) = ($k =~ m!/git/([0-9]+)\.git\z!); + ok(-w "$dst/git/$nr.git", "writable $nr.git in manifest"); + } + for my $ro (grep { !-w $_ } @g2) { + my ($nr) = ($ro =~ m!/git/([0-9]+)\.git\z!); + is(grep(m!/git/$nr\.git\z!, keys %$m), 0, + "read-only $nr.git not in manifest") + or xbail([sort keys %$m]); + } } my $err = ''; -my $v110 = xqx([qw(git rev-parse v1.1.0-pre1)], undef, { 2 => \$err }); +my $oldrev = '0b3e19584c90d958a723ac2d3dec3f84f5513688~1'; +# 3e0e596105198cfa (wwwlisting: allow hiding entries from manifest, 2019-06-09) +$oldrev = xqx([qw(git rev-parse), $oldrev], undef, { 2 => \$err }); SKIP: { skip("no detected public-inbox GIT_DIR ($err)", 1) if $?; + require_mods('Email::MIME', 1); # for legacy revision # using plackup to test old PublicInbox::WWW since -httpd from # back then relied on some packages we no longer depend on - my $plackup = which('plackup') or skip('no plackup in path', 1); + my $plackup = require_cmd('plackup', 1) or skip('no plackup in path', 1); require PublicInbox::Lock; - chomp $v110; + chomp $oldrev; my ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!); - my $wt = "t/data-gen/$base.pre-manifest"; + my $wt = "t/data-gen/$base.pre-manifest-$oldrev"; my $lk = bless { lock_path => __FILE__ }, 'PublicInbox::Lock'; $lk->lock_acquire; my $psgi = "$wt/app.psgi"; if (!-f $psgi) { # checkout a pre-manifest.js.gz version my $t = File::Temp->new(TEMPLATE => 'g-XXXX', TMPDIR => 1); my $env = { GIT_INDEX_FILE => $t->filename }; - xsys([qw(git read-tree), $v110], $env) and xbail 'read-tree'; + xsys([qw(git read-tree), $oldrev], $env) and xbail 'read-tree'; xsys([qw(git checkout-index -a), "--prefix=$wt/"], $env) and xbail 'checkout-index'; my $f = "$wt/app.psgi.tmp.$$"; @@ -329,17 +363,19 @@ EOM $td->join('TERM'); open $rdr->{2}, '>>', "$tmpdir/plackup.err.log" or xbail "open: $!"; open $rdr->{1}, '>>&', $rdr->{2} or xbail "open: $!"; - $td = start_script($cmd, { PERL5LIB => 'lib' }, $rdr); + my $env = { PERL5LIB => 'lib', PERL_INLINE_DIRECTORY => undef }; + $td = start_script($cmd, $env, $rdr); # wait for plackup socket()+bind()+listen() my %opt = ( Proto => 'tcp', Type => Socket::SOCK_STREAM(), PeerAddr => "$host:$port" ); - for (0..50) { + for (0..100) { tick(); last if IO::Socket::INET->new(%opt); } + IO::Socket::INET->new(%opt) or xbail "connect $host:$port: $!"; my $dst = "$tmpdir/scrape"; @cmd = (qw(-clone -q), "http://$host:$port/v2", $dst); - run_script(\@cmd, undef, { 2 => \(my $err = '') }); + run_script(\@cmd, undef, { 2 => \($err = '') }); is($?, 0, 'scraping clone on old PublicInbox::WWW') or diag $err; my @g_all = glob("$dst/git/*.git"); @@ -349,9 +385,17 @@ EOM @cmd = (qw(-clone -q --epoch=~0), "http://$host:$port/v2", $dst); run_script(\@cmd, undef, { 2 => \($err = '') }); is($?, 0, 'partial scraping clone on old PublicInbox::WWW'); - my @g_last = grep { -w $_ } glob("$dst/git/*.git"); + my @g_last = grep { (stat($_))[2] & 0200 } glob("$dst/git/*.git"); is_deeply(\@g_last, [ $g_all[-1] ], 'partial clone of ~0 worked'); + chmod(0755, $g_all[0]) or xbail "chmod $!"; + my @before = glob("$g_all[0]/objects/*/*"); + run_script([qw(-fetch -v)], undef, { -C => $dst, 2 => \($err = '') }); + is($?, 0, 'scraping fetch on old PublicInbox::WWW') or diag $err; + my @after = glob("$g_all[0]/objects/*/*"); + ok(scalar(@before) < scalar(@after), + 'fetched 0.git after enabling write-bit'); + $td->join('TERM'); }