X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=77fa1e09691d01cf0b35531528f37b7c1adc3966;hb=62f28026e624ed30d620063a0fa92cbedb7f6673;hp=fe322eab00310417a6fed0a244146691d29b88b6;hpb=53ac5b18f6f124fe33bf6736aac0b8c85a0d0d1b;p=public-inbox.git diff --git a/t/solver_git.t b/t/solver_git.t index fe322eab..77fa1e09 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -3,26 +3,22 @@ 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(spawn); +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,19 +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'; -my $gits = [ PublicInbox::Git->new($git_dir) ]; -my $solver = PublicInbox::SolverGit->new($gits, [ $ibx ]); -open my $log, '+>>', "$mainrepo/solve.log" or die "open: $!"; -my $res = $solver->solve($log, '69df7d5', {}); +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: $!"; +my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http' }; +$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'); @@ -62,20 +62,33 @@ if (0) { # TODO: check this? diag $z; } +my $oid = $expect; +for my $i (1..2) { + my $more; + my $s = PublicInbox::SolverGit->new($ibx, sub { $more = $_[0] }); + $s->solve($psgi_env, $log, $oid, {}); + is($more->[1], $expect, 'resolved blob to long OID '.$i); + chop($oid); +} + +$solver = undef; $res = undef; my $wt_git_dir = $wt_git->{git_dir}; $wt_git = undef; ok(!-d $wt_git_dir, 'no references to WT held'); -$res = $solver->solve($log, '0'x40, {}); +$solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] }); +$solver->solve($psgi_env, $log, '0'x40, {}); is($res, undef, 'no error on z40'); my $git_v2_20_1_tag = '7a95a1cd084cb665c5c2586a415e42df0213af74'; -$res = $solver->solve($log, $git_v2_20_1_tag, {}); +$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'); -$res = $solver->solve($log, '0a92431', {}); +$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'); my $hints = { @@ -83,9 +96,98 @@ my $hints = { path_a => 'HACKING', path_b => 'CONTRIBUTING' }; -my $hinted = $solver->solve($log, '0a92431', $hints); +$solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] }); +$solver->solve($psgi_env, $log, '0a92431', $hints); +my $hinted = $res; # don't compare ::Git objects: 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 ($rout, $wout)) or die; + pipe(my ($rin, $win)) or die; + my $rdr = { 0 => $rin, 1 => $wout }; + my $pid = spawn($cmd , $env, $rdr); + $wout = $rin = undef; + print { $win } ("\0" x $size) or die; + close $win or die; + chomp($oid{$label} = <$rout>); + } + + # 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 $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();