X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=2dbb07b0cdef33cbe0c120e7c849dd2596f6cb61;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=8de63988e9c51ce677a41b2e9752891b8824f2cc;hpb=65323f060a3db731bb9fafa004336eeb4bbb8f00;p=public-inbox.git diff --git a/t/solver_git.t b/t/solver_git.t index 8de63988..2dbb07b0 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -1,28 +1,24 @@ -# Copyright (C) 2019 all contributors +# Copyright (C) 2019-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; -use File::Temp qw(tempdir); use Cwd qw(abs_path); -require './t/common.perl'; +use PublicInbox::TestCommon; require_git(2.6); - -my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test - URI::Escape Plack::Builder); -foreach my $mod (@mods) { - eval "require $mod"; - plan skip_all => "$mod missing for $0" if $@; -} +use PublicInbox::Spawn qw(popen_rd); +require_mods(qw(DBD::SQLite Search::Xapian Plack::Util)); chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`); plan skip_all => "$0 must be run from a git working tree" if $?; + +# 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 MIME Git SolverGit)); +use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit WWW)); -my $mainrepo = tempdir('pi-solver-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($inboxdir, $for_destroy) = tmpdir(); my $opts = { - mainrepo => $mainrepo, + inboxdir => $inboxdir, name => 'test-v2writable', version => 2, -primary_address => 'test@example.com', @@ -31,20 +27,23 @@ my $ibx = PublicInbox::Inbox->new($opts); my $im = PublicInbox::V2Writable->new($ibx, 1); $im->{parallel} = 0; -sub deliver_patch ($) { +my $deliver_patch = sub ($) { open my $fh, '<', $_[0] or die "open: $!"; my $mime = PublicInbox::MIME->new(do { local $/; <$fh> }); $im->add($mime); $im->done; -} +}; -deliver_patch('t/solve/0001-simple-mod.patch'); +$deliver_patch->('t/solve/0001-simple-mod.patch'); +my $v1_0_0_tag = 'cb7c42b1e15577ed2215356a2bf925aef59cdd8d'; -$ibx->{-repo_objs} = [ PublicInbox::Git->new($git_dir) ]; +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, '+>>', "$mainrepo/solve.log" or die "open: $!"; -my $psgi_env = { 'psgi.errors' => *STDERR }; +open my $log, '+>>', "$inboxdir/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]; @@ -88,7 +87,7 @@ $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'); +$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'); @@ -105,4 +104,99 @@ 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); +SKIP: { + require_mods(@psgi, 7 + scalar(@psgi)); + use_ok($_) for @psgi; + my $binfoo = "$inboxdir/binfoo.git"; + system(qw(git init --bare -q), $binfoo) == 0 or die "git init: $?"; + require_ok 'PublicInbox::ViewVCS'; + my $big_size = do { + no warnings 'once'; + $PublicInbox::ViewVCS::MAX_SIZE + 1; + }; + 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 "$?"; + } + + # ensure the PSGI frontend (ViewVCS) works: + my $name = $ibx->{name}; + my $cfgpfx = "publicinbox.$name"; + my $cfgpath = "$inboxdir/httpd-config"; + open my $cfgfh, '>', $cfgpath or die; + print $cfgfh <{address}; + inboxdir = $inboxdir + coderepo = public-inbox + coderepo = binfoo + url = http://example.com/$name +[coderepo "public-inbox"] + dir = $git_dir + cgiturl = http://example.com/public-inbox +[coderepo "binfoo"] + dir = $binfoo + cgiturl = http://example.com/binfoo +EOF + close $cfgfh or die; + 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'; + my @warn; + my $res = do { + local $SIG{__WARN__} = sub { push @warn, @_ }; + $cb->(GET("/$name/$mid/")); + }; + is_deeply(\@warn, [], 'no warnings from rendering diff'); + like($res->content, qr!>Ω!, 'omega escaped'); + + $res = $cb->(GET("/$name/3435775/s/")); + is($res->code, 200, 'success with existing blob'); + + $res = $cb->(GET("/$name/".('0'x40).'/s/')); + is($res->code, 404, 'failure with null OID'); + + $res = $cb->(GET("/$name/$non_existent/s/")); + is($res->code, 404, 'failure with null OID'); + + $res = $cb->(GET("/$name/$v1_0_0_tag/s/")); + is($res->code, 200, 'shows commit'); + 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, + "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"); + } + }; + test_psgi(sub { $www->call(@_) }, $client); + 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); + } +} + done_testing();