diff options
Diffstat (limited to 't/solver_git.t')
| -rw-r--r-- | t/solver_git.t | 221 |
1 files changed, 185 insertions, 36 deletions
diff --git a/t/solver_git.t b/t/solver_git.t index 1baa012b..db672904 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -1,22 +1,23 @@ #!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> -use strict; -use v5.10.1; +use v5.12; use PublicInbox::TestCommon; use Cwd qw(abs_path); -require_git(2.6); +require_git v2.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)}); +use PublicInbox::Spawn qw(run_qx); +require_mods(qw(DBD::SQLite Xapian URI::Escape)); +require PublicInbox::SolverGit; +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; # needed for alternates, and --absolute-git-dir is only in git 2.13+ $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; @@ -28,14 +29,22 @@ my $ibx = create_inbox 'v2', version => 2, $im->add($patch2) or BAIL_OUT; }; my $md = "$tmpdir/md"; -File::Path::mkpath([map { $md.$_ } (qw(/ /cur /new /tmp))]); +File::Path::make_path(map { $md.$_ } (qw(/cur /new /tmp))); symlink(abs_path('t/solve/0001-simple-mod.patch'), "$md/cur/foo:2,") or xbail "symlink: $!"; +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'; +my $stderr_empty = sub { + my ($msg) = @_; + open my $efh, '<', "$tmpdir/stderr.log" or xbail $!; + my @l = <$efh>; + @l = grep(!/reverse ?proxy/i, @l); + is_xdeeply(\@l, [], $msg // 'stderr.log is empty'); +}; test_lei({tmpdir => "$tmpdir/blob"}, sub { lei_ok('blob', '--mail', $patch2_oid, '-I', $ibx->{inboxdir}, @@ -199,10 +208,11 @@ my $hinted = $res; shift @$res; shift @$hinted; is_deeply($res, $hinted, 'hints work (or did not hurt :P'); -my @psgi = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder); +my @psgi = qw(HTTP::Request::Common Plack::Test Plack::Builder); SKIP: { require_mods(@psgi, 7 + scalar(@psgi)); use_ok($_) for @psgi; + require PublicInbox::WWW; my $binfoo = "$ibx->{inboxdir}/binfoo.git"; my $l = "$ibx->{inboxdir}/inbox.lock"; -f $l or BAIL_OUT "BUG: $l missing: $!"; @@ -213,27 +223,48 @@ SKIP: { }; my %bin = (big => $big_size, small => 1); my %oid; # (small|big) => OID - my $lk = bless { lock_path => $l }, 'PublicInbox::Lock'; + require PublicInbox::Lock; + my $lk = PublicInbox::Lock->new($l); my $acq = $lk->lock_for_scope; - my $stamp = "$binfoo/stamp"; + 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; + my $rdr = { 0 => \("\0" x $size) }; + chomp(my $x = run_qx($cmd , $env, $rdr)); + xbail "@$cmd: \$?=$?" if $?; $oid{$label} = $x; } + + open my $null, '<', '/dev/null' or xbail "open /dev/null: $!"; + my $t = xqx([qw(git mktree)], $env, { 0 => $null }); + xbail "mktree: $?" if $?; + chomp($t); + my $non_utf8 = "K\x{e5}g"; + $env->{GIT_AUTHOR_NAME} = $non_utf8; + $env->{GIT_AUTHOR_EMAIL} = 'e@example.com'; + $env->{GIT_COMMITTER_NAME} = $env->{GIT_AUTHOR_NAME}; + $env->{GIT_COMMITTER_EMAIL} = $env->{GIT_AUTHOR_EMAIL}; + my $in = \"$non_utf8\n\nK\x{e5}g\n"; + my @ct = qw(git -c i18n.commitEncoding=iso-8859-1 commit-tree); + my $c = xqx([@ct, $t], $env, { 0 => $in }); + xbail "commit-tree: $?" if $?; + chomp($c); + $oid{'iso-8859-1'} = $c; + + $c = xqx([@ct, '-p', $c, $t], $env, { 0 => $in }); + xbail "commit-tree: $?" if $?; + chomp($c); + $oid{'8859-parent'} = $c; + + open my $fh, '>', "$stamp.$$" or BAIL_OUT; + while (my ($k, $v) = each %oid) { + print $fh "$k=$v\n" or xbail "print: $!"; + } close $fh or BAIL_OUT; rename("$stamp.$$", $stamp) or BAIL_OUT; } @@ -244,6 +275,8 @@ SKIP: { my $cfgpath = "$tmpdir/httpd-config"; open my $cfgfh, '>', $cfgpath or die; print $cfgfh <<EOF or die; +[coderepo] + snapshots = tar.gz [publicinbox "$name"] address = $ibx->{-primary_address} inboxdir = $ibx->{inboxdir} @@ -258,6 +291,16 @@ 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 $client = sub { @@ -278,7 +321,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)'); @@ -287,38 +330,144 @@ 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}) { + $stderr_empty->('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)'); + $stderr_empty->(); + + $res = $cb->(GET("/binfoo/$oid{'iso-8859-1'}/s/")); + is($res->code, 200, 'ISO-8859-1 commit'); + like($res->content, qr/Kåg/, 'ISO-8859-1 commit message'); + $stderr_empty->(); + + $res = $cb->(GET("/binfoo/$oid{'8859-parent'}/s/")); + is($res->code, 200, 'commit w/ ISO-8859-parent'); + like($res->content, qr/Kåg/, 'ISO-8859-1 commit message'); + $stderr_empty->(); + + $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 = eval { XML::TreePP->new->parse($res->content) } + or diag explain($res); + is(scalar @{$t->{feed}->{entry}}, 50, + 'got 50 entries') or diag explain([$t, $res]); + + $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') or + diag explain([ $t, $res ]); + + $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 { "$tmpdir/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) = tcp_host_port($sock); - my $url = "http://$h:$p"; - local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = $url; - 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 { - my $rurl = "$url/$name"; 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(); |