X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=1baa012b1abeb56a77c98519e8a27b08697aafe9;hb=refs%2Fheads%2Fmaster;hp=6b0ed8d27677dcaecbf1ed5070f05ef481e43695;hpb=37df9d6964061f437e37646d8858ade4b6f13a24;p=public-inbox.git diff --git a/t/solver_git.t b/t/solver_git.t index 6b0ed8d2..c65d9785 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -1,14 +1,17 @@ -# Copyright (C) 2019-2020 all contributors +#!perl -w +# Copyright (C) all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; -use Cwd qw(abs_path); +use v5.10.1; use PublicInbox::TestCommon; +use Cwd qw(abs_path); require_git(2.6); +use PublicInbox::ContentHash qw(git_sha); use PublicInbox::Spawn qw(popen_rd); require_mods(qw(DBD::SQLite Search::Xapian Plack::Util)); -my $git_dir = xqx([qw(git rev-parse --git-dir)], undef, {2 => \(my $null)}); +my $rdr = { 2 => \(my $null) }; +my $git_dir = xqx([qw(git rev-parse --git-common-dir)], undef, $rdr); +$git_dir = xqx([qw(git rev-parse --git-dir)], undef, $rdr) if $? != 0; $? == 0 or plan skip_all => "$0 must be run from a git working tree"; chomp $git_dir; @@ -16,39 +19,141 @@ chomp $git_dir; $git_dir = abs_path($git_dir); use_ok "PublicInbox::$_" for (qw(Inbox V2Writable Git SolverGit WWW)); +my $patch2 = eml_load 't/solve/0002-rename-with-modifications.patch'; +my $patch2_oid = git_sha(1, $patch2)->hexdigest; -my ($inboxdir, $for_destroy) = tmpdir(); -my $opts = { - inboxdir => $inboxdir, - name => 'test-v2writable', - version => 2, - -primary_address => 'test@example.com', -}; -my $ibx = PublicInbox::Inbox->new($opts); -my $im = PublicInbox::V2Writable->new($ibx, 1); -$im->{parallel} = 0; - -my $deliver_patch = sub ($) { - $im->add(eml_load($_[0])); - $im->done; +my ($tmpdir, $for_destroy) = tmpdir(); +my $ibx = create_inbox 'v2', version => 2, + indexlevel => 'medium', sub { + my ($im) = @_; + $im->add(eml_load 't/solve/0001-simple-mod.patch') or BAIL_OUT; + $im->add($patch2) or BAIL_OUT; }; +my $md = "$tmpdir/md"; +File::Path::mkpath([map { $md.$_ } (qw(/ /cur /new /tmp))]); +symlink(abs_path('t/solve/0001-simple-mod.patch'), "$md/cur/foo:2,") or + xbail "symlink: $!"; -$deliver_patch->('t/solve/0001-simple-mod.patch'); +my $v1_0_0_rev = '8a918a8523bc9904123460f85999d75f6d604916'; my $v1_0_0_tag = 'cb7c42b1e15577ed2215356a2bf925aef59cdd8d'; my $v1_0_0_tag_short = substr($v1_0_0_tag, 0, 16); +my $expect = '69df7d565d49fbaaeb0a067910f03dc22cd52bd0'; +my $non_existent = 'ee5e32211bf62ab6531bdf39b84b6920d0b6775a'; + +test_lei({tmpdir => "$tmpdir/blob"}, sub { + lei_ok('blob', '--mail', $patch2_oid, '-I', $ibx->{inboxdir}, + \'--mail works for existing oid'); + is($lei_out, $patch2->as_string, 'blob matches'); + ok(!lei('blob', '--mail', '69df7d5', '-I', $ibx->{inboxdir}), + "--mail won't run solver"); + like($lei_err, qr/\b69df7d5\b/, 'OID in error by git(1)'); + + lei_ok('blob', '69df7d5', '-I', $ibx->{inboxdir}); + is(git_sha(1, \$lei_out)->hexdigest, $expect, 'blob contents output'); + my $prev = $lei_out; + lei_ok(qw(blob --no-mail 69df7d5 -I), $ibx->{inboxdir}); + is($lei_out, $prev, '--no-mail works'); + ok(!lei(qw(blob -I), $ibx->{inboxdir}, $non_existent), + 'non-existent blob fails'); + my $abbrev = substr($non_existent, 0, 7); + like($lei_err, qr/could not find $abbrev/, 'failed abbreviation noted'); + SKIP: { + skip '/.git exists', 1 if -e '/.git'; + lei_ok(qw(-C / blob 69df7d5 -I), $ibx->{inboxdir}, + "--git-dir=$git_dir"); + is($lei_out, $prev, '--git-dir works'); + + ok(!lei(qw(-C / blob --no-cwd 69df7d5 -I), $ibx->{inboxdir}), + '--no-cwd works'); + like($lei_err, qr/no --git-dir to try/, + 'lack of --git-dir noted'); + + ok(!lei(qw(-C / blob -I), $ibx->{inboxdir}, $non_existent), + 'non-existent blob fails'); + like($lei_err, qr/no --git-dir to try/, + 'lack of --git-dir noted'); + } + + # fallbacks + lei_ok('blob', $v1_0_0_tag, '-I', $ibx->{inboxdir}); + lei_ok('blob', $v1_0_0_tag_short, '-I', $ibx->{inboxdir}); +}); + +test_lei({tmpdir => "$tmpdir/rediff"}, sub { + lei_ok(qw(rediff -q -U9 t/solve/0001-simple-mod.patch)); + like($lei_out, qr!^\Q+++\E b/TODO\n@@ -103,9 \+103,11 @@!sm, + 'got more context with -U9'); + + my (undef, $re) = split(/\n\n/, $lei_out, 2); + $re =~ s/^/> /sgm; + substr($re, 0, 0, < \$re, %$lei_opt }); + my $exp = <<'EOM'; +From: me@example.com +Subject: Re: awesome advice + +EOM + like($lei_out, qr/\Q$exp\E/, '--drq preserved header'); + + # n.b. --drq can requote the attribution line ("So-and-so wrote:"), + # but it's probably not worth preventing... + + $exp = <<'EOM'; +> --- +> TODO | 2 ++ +> Ω | 5 -- +> 1 file changed, 2 insertions(+) +> +> diff --git a/TODO b/TODO +> index 605013e4904baabecd4a0a55997aebd8e8477a8f..69df7d565d49fbaaeb0a067910f03dc22cd52bd0 100644 +> --- a/TODO +> +++ b/TODO +> @@ -96,16 +96,18 @@ all need to be considered for everything we introduce) +EOM + $exp =~ s/^>$/> /sgm; # re-add trailing white space + like($lei_out, qr/\Q$exp\E/, '--drq diffstat + context'); + + lei_ok(qw(rediff -q --full-index -U9 t/solve/bare.patch)); + $exp = <<'EOM'; +diff --git a/script/public-inbox-extindex b/script/public-inbox-extindex +old mode 100644 +new mode 100755 +index 15ac20eb871bf47697377e58a27db23102a38fca..771486c425b315bae70fd8a82d62ab0331e0a827 +--- a/script/public-inbox-extindex ++++ b/script/public-inbox-extindex +@@ -1,13 +1,12 @@ + #!perl -w +EOM + like($lei_out, qr/\Q$exp\E/, + 'preserve mode, regen header + context from -U0 patch'); + is($lei_err, '', 'no warnings from bare patch'); + my $e = { GIT_DIR => "$ENV{HOME}/.local/share/lei/store/ALL.git" }; + my @x = xqx([qw(git cat-file --batch-all-objects --batch-check)], $e); + is_deeply(\@x, [], 'no objects stored') or diag explain(\@x); +}); + +test_lei({tmpdir => "$tmpdir/index-eml-only"}, sub { + lei_ok(qw(index), $md); + lei_ok(qw(blob 69df7d5)); # hits LeiSearch->smsg_eml -> lms->local_blob +}); my $git = PublicInbox::Git->new($git_dir); $ibx->{-repo_objs} = [ $git ]; my $res; my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] }); -open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!"; +open my $log, '+>>', "$tmpdir/solve.log" or die "open: $!"; my $psgi_env = { 'psgi.errors' => \*STDERR, 'psgi.url_scheme' => 'http', 'HTTP_HOST' => 'example.com' }; $solver->solve($psgi_env, $log, '69df7d5', {}); ok($res, 'solved a blob!'); my $wt_git = $res->[0]; is(ref($wt_git), 'PublicInbox::Git', 'got a git object for the blob'); -my $expect = '69df7d565d49fbaaeb0a067910f03dc22cd52bd0'; is($res->[1], $expect, 'resolved blob to unabbreviated identifier'); is($res->[2], 'blob', 'type specified'); is($res->[3], 4405, 'size returned'); @@ -57,12 +162,6 @@ is(ref($wt_git->cat_file($res->[1])), 'SCALAR', 'wt cat-file works'); is_deeply([$expect, 'blob', 4405], [$wt_git->check($res->[1])], 'wt check works'); -if (0) { # TODO: check this? - seek($log, 0, 0); - my $z = do { local $/; <$log> }; - diag $z; -} - my $oid = $expect; for my $i (1..2) { my $more; @@ -87,7 +186,6 @@ $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] }); $solver->solve($psgi_env, $log, $git_v2_20_1_tag, {}); is($res, undef, 'no error on a tag not in our repo'); -$deliver_patch->('t/solve/0002-rename-with-modifications.patch'); $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] }); $solver->solve($psgi_env, $log, '0a92431', {}); ok($res, 'resolved without hints'); @@ -108,9 +206,9 @@ my @psgi = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder); SKIP: { require_mods(@psgi, 7 + scalar(@psgi)); use_ok($_) for @psgi; - my $binfoo = "$inboxdir/binfoo.git"; - require PublicInbox::Import; - PublicInbox::Import::init_bare($binfoo); + my $binfoo = "$ibx->{inboxdir}/binfoo.git"; + my $l = "$ibx->{inboxdir}/inbox.lock"; + -f $l or BAIL_OUT "BUG: $l missing: $!"; require_ok 'PublicInbox::ViewVCS'; my $big_size = do { no warnings 'once'; @@ -118,27 +216,42 @@ SKIP: { }; my %bin = (big => $big_size, small => 1); my %oid; # (small|big) => OID - my $cmd = [ qw(git hash-object -w --stdin) ]; - my $env = { GIT_DIR => $binfoo }; - while (my ($label, $size) = each %bin) { - pipe(my ($rin, $win)) or die; - my $rout = popen_rd($cmd , $env, { 0 => $rin }); - $rin = undef; - print { $win } ("\0" x $size) or die; - close $win or die; - chomp($oid{$label} = <$rout>); - close $rout or die "$?"; + my $lk = bless { lock_path => $l }, 'PublicInbox::Lock'; + my $acq = $lk->lock_for_scope; + my $stamp = "$binfoo/stamp"; + if (open my $fh, '<', $stamp) { + %oid = map { chomp; split(/=/, $_) } (<$fh>); + } else { + PublicInbox::Import::init_bare($binfoo); + my $cmd = [ qw(git hash-object -w --stdin) ]; + my $env = { GIT_DIR => $binfoo }; + open my $fh, '>', "$stamp.$$" or BAIL_OUT; + while (my ($label, $size) = each %bin) { + pipe(my ($rin, $win)) or BAIL_OUT; + my $rout = popen_rd($cmd , $env, { 0 => $rin }); + $rin = undef; + print { $win } ("\0" x $size) or BAIL_OUT; + close $win or BAIL_OUT; + chomp(my $x = <$rout>); + close $rout or BAIL_OUT "$?"; + print $fh "$label=$x\n" or BAIL_OUT; + $oid{$label} = $x; + } + close $fh or BAIL_OUT; + rename("$stamp.$$", $stamp) or BAIL_OUT; } - + undef $acq; # ensure the PSGI frontend (ViewVCS) works: my $name = $ibx->{name}; my $cfgpfx = "publicinbox.$name"; - my $cfgpath = "$inboxdir/httpd-config"; + my $cfgpath = "$tmpdir/httpd-config"; open my $cfgfh, '>', $cfgpath or die; print $cfgfh <{address}; - inboxdir = $inboxdir + address = $ibx->{-primary_address} + inboxdir = $ibx->{inboxdir} coderepo = public-inbox coderepo = binfoo url = http://example.com/$name @@ -150,9 +263,18 @@ SKIP: { cgiturl = http://example.com/binfoo EOF close $cfgfh or die; + my $exp_digest; + { + my $exp = xqx([qw(git archive --format=tar.gz + --prefix=public-inbox-1.0.0/ v1.0.0)], + { GIT_DIR => $git_dir }); + is($?, 0, 'no error from git archive'); + ok(length($exp) > 1024, 'expected archive generated'); + $exp_digest = git_sha(256, \$exp)->hexdigest; + }; + my $cfg = PublicInbox::Config->new($cfgpath); my $www = PublicInbox::WWW->new($cfg); - my $non_existent = 'ee5e32211bf62ab6531bdf39b84b6920d0b6775a'; my $client = sub { my ($cb) = @_; my $mid = '20190401081523.16213-1-BOFH@YHBT.net'; @@ -171,7 +293,7 @@ EOF is($res->code, 404, 'failure with null OID'); $res = $cb->(GET("/$name/$non_existent/s/")); - is($res->code, 404, 'failure with null OID'); + is($res->code, 404, 'failure with non-existent OID'); $res = $cb->(GET("/$name/$v1_0_0_tag/s/")); is($res->code, 200, 'shows commit (unabbreviated)'); @@ -180,26 +302,132 @@ EOF while (my ($label, $size) = each %bin) { $res = $cb->(GET("/$name/$oid{$label}/s/")); is($res->code, 200, "$label binary file"); - ok(index($res->content, "blob $size bytes") >= 0, + ok(index($res->content, + "blob $oid{$label} $size bytes") >= 0, "showed $label binary blob size"); $res = $cb->(GET("/$name/$oid{$label}/s/raw")); is($res->code, 200, "$label raw binary download"); is($res->content, "\0" x $size, "$label content matches"); } + my $utf8 = 'e022d3377fd2c50fd9931bf96394728958a90bf3'; + $res = $cb->(GET("/$name/$utf8/s/")); + is($res->code, 200, 'shows commit w/ utf8.eml'); + like($res->content, qr/Eléanor/, + 'UTF-8 commit shown properly'); + + # WwwCoderepo + my $olderr; + if (defined $ENV{PLACK_TEST_EXTERNALSERVER_URI}) { + ok(!-s "$tmpdir/stderr.log", + 'nothing in stderr.log, yet'); + } else { + open $olderr, '>&', \*STDERR or xbail "open: $!"; + open STDERR, '+>>', "$tmpdir/stderr.log" or + xbail "open: $!"; + } + $res = $cb->(GET('/binfoo/')); + defined($ENV{PLACK_TEST_EXTERNALSERVER_URI}) or + open STDERR, '>&', $olderr or xbail "open: $!"; + is($res->code, 200, 'coderepo summary (binfoo)'); + ok(!-s "$tmpdir/stderr.log"); + $res = $cb->(GET('/public-inbox/')); + is($res->code, 200, 'coderepo summary (public-inbox)'); + + my $tip = 'invalid-'.int(rand(0xdeadbeef)); + $res = $cb->(GET('/public-inbox/?h='.$tip)); + is($res->code, 200, 'coderepo summary on dead branch'); + like($res->content, qr/no commits in `\Q$tip\E', yet/, + 'lack of commits noted'); + + $res = $cb->(GET('/public-inbox')); + is($res->code, 301, 'redirected'); + + my $fn = 'public-inbox-1.0.0.tar.gz'; + $res = $cb->(GET("/public-inbox/snapshot/$fn")); + is($res->code, 200, 'tar.gz snapshot'); + is($res->header('Content-Disposition'), + qq'inline; filename="$fn"', 'c-d header'); + is($res->header('ETag'), qq'"$v1_0_0_rev"', 'etag header'); + + my $got = $res->content; + is(git_sha(256, \$got)->hexdigest, $exp_digest, + "content matches installed `git archive' output"); + undef $got; + + $fn = 'public-inbox-1.0.2.tar.gz'; + $res = $cb->(GET("/public-inbox/snapshot/$fn")); + is($res->code, 404, '404 on non-existent tag'); + + $fn = 'public-inbox-1.0.0.tar.bz2'; + $res = $cb->(GET("/public-inbox/snapshot/$fn")); + is($res->code, 404, '404 on unconfigured snapshot format'); + + $res = $cb->(GET('/public-inbox/atom/')); + is($res->code, 200, 'Atom feed'); + SKIP: { + require_mods('XML::TreePP', 1); + my $t = XML::TreePP->new->parse($res->content); + is(scalar @{$t->{feed}->{entry}}, 50, + 'got 50 entries'); + + $res = $cb->(GET('/public-inbox/atom/COPYING')); + is($res->code, 200, 'file Atom feed'); + $t = XML::TreePP->new->parse($res->content); + ok($t->{feed}->{entry}, 'got entry'); + + $res = $cb->(GET('/public-inbox/atom/README.md')); + is($res->code, 404, '404 on missing file Atom feed'); + + $res = $cb->(GET('/public-inbox/atom/?h=gone')); + is($res->code, 404, '404 on missing Atom feed branch'); + } + + $res = $cb->(GET('/public-inbox/tree/')); + is($res->code, 200, 'got 200 for root listing'); + $got = $res->content; + like($got, qr/\bgit ls-tree\b/, 'ls-tree help shown'); + + $res = $cb->(GET('/public-inbox/tree/README')); + is($res->code, 200, 'got 200 for regular file'); + $got = $res->content; + like($got, qr/\bgit show\b/, 'git show help shown'); + + $res = $cb->(GET('/public-inbox/tree/Documentation')); + is($res->code, 200, 'got 200 for a directory'); + $got = $res->content; + like($got, qr/\bgit ls-tree\b/, 'ls-tree help shown'); + + $res = $cb->(GET('/public-inbox/tree/?h=no-branch')); + is($res->code, 404, 'got 404 for non-existent ref root'); + $res = $cb->(GET('/public-inbox/tree/README?h=no-file')); + is($res->code, 404, 'got 404 for non-existent ref README'); + $res = $cb->(GET('/public-inbox/tree/Documentation?h=no-dir')); + is($res->code, 404, 'got 404 for non-existent ref directory'); + + $res = $cb->(GET('/public-inbox/tags.atom')); + is($res->code, 200, 'Atom feed'); + SKIP: { + require_mods('XML::TreePP', 1); + my $t = XML::TreePP->new->parse($res->content); + ok(scalar @{$t->{feed}->{entry}}, 'got tag entries'); + } }; test_psgi(sub { $www->call(@_) }, $client); + my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir }; + test_httpd($env, $client, 7, sub { SKIP: { - require_mods(qw(Plack::Test::ExternalServer), 7); - my $env = { PI_CONFIG => $cfgpath }; - my $sock = tcp_server() or die; - my ($out, $err) = map { "$inboxdir/std$_.log" } qw(out err); - my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ]; - my $td = start_script($cmd, $env, { 3 => $sock }); - my ($h, $p) = ($sock->sockhost, $sock->sockport); - local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p"; - Plack::Test::ExternalServer::test_psgi(client => $client); - } + require_cmd('curl', 1) or skip 'no curl', 1; + mkdir "$tmpdir/ext" // xbail "mkdir $!"; + my $rurl = "$ENV{PLACK_TEST_EXTERNALSERVER_URI}/$name"; + test_lei({tmpdir => "$tmpdir/ext"}, sub { + lei_ok(qw(blob --no-mail 69df7d5 -I), $rurl); + is(git_sha(1, \$lei_out)->hexdigest, $expect, + 'blob contents output'); + ok(!lei(qw(blob -I), $rurl, $non_existent), + 'non-existent blob fails'); + }); + }}); } done_testing();