X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=2dbb07b0cdef33cbe0c120e7c849dd2596f6cb61;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=88f83bdb7ae28525b75c7e97bb3a374817930dc2;hpb=684d26cecc0891261783be179909b0e434692b25;p=public-inbox.git diff --git a/t/solver_git.t b/t/solver_git.t index 88f83bdb..2dbb07b0 100644 --- a/t/solver_git.t +++ b/t/solver_git.t @@ -1,18 +1,13 @@ -# Copyright (C) 2019 all contributors +# Copyright (C) 2019-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use Cwd qw(abs_path); -require './t/common.perl'; +use PublicInbox::TestCommon; require_git(2.6); -use PublicInbox::Spawn qw(spawn); - -my @mods = qw(DBD::SQLite Search::Xapian); -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 $?; @@ -43,17 +38,12 @@ $deliver_patch->('t/solve/0001-simple-mod.patch'); my $v1_0_0_tag = 'cb7c42b1e15577ed2215356a2bf925aef59cdd8d'; my $git = PublicInbox::Git->new($git_dir); -is('public-inbox 1.0.0', - $git->commit_title($v1_0_0_tag), - 'commit_title works on 1.0.0'); - -is(undef, $git->commit_title('impossible'), 'undef on impossible object'); - $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 }; +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]; @@ -116,11 +106,7 @@ is_deeply($res, $hinted, 'hints work (or did not hurt :P'); my @psgi = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder); SKIP: { - my @missing; - for my $mod (@psgi) { - eval("require $mod") or push(@missing, $mod); - } - skip("missing: ".join(', ', @missing), 7 + scalar(@psgi)) if @missing; + 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: $?"; @@ -134,38 +120,58 @@ SKIP: { 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 => fileno($rin), 1 => fileno($wout) }; - my $pid = spawn($cmd , $env, $rdr); - $wout = $rin = undef; + 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 $cfg = PublicInbox::Config->new(\<{address}; -$cfgpfx.inboxdir=$inboxdir -$cfgpfx.coderepo=public-inbox -$cfgpfx.coderepo=binfoo -coderepo.public-inbox.dir=$git_dir -coderepo.public-inbox.cgiturl=http://example.com/public-inbox -coderepo.binfoo.dir=$binfoo -coderepo.binfoo.cgiturl=http://example.com/binfoo + 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); - test_psgi(sub { $www->call(@_) }, sub { + my $non_existent = 'ee5e32211bf62ab6531bdf39b84b6920d0b6775a'; + my $client = sub { my ($cb) = @_; - my $res = $cb->(GET("/$name/3435775/s/")); + 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) { @@ -178,7 +184,19 @@ EOF 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();