X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=78cc0edde0d29e9ac75bc4958f52bc090acae4ff;hb=29c5f2a6fc3b86306a5dbeadfae061d06f2bc6dd;hp=9bda157d114ccf387313fd20540f9d5d5fde643d;hpb=ad6f26f3b9f0e428020d05667987556f8fcbec2f;p=public-inbox.git
diff --git a/t/solver_git.t b/t/solver_git.t
index 9bda157d..78cc0edd 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -1,25 +1,21 @@
-# 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);
-
-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 $@;
-}
-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 $?;
+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)});
+$? == 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 MIME Git SolverGit));
+use_ok "PublicInbox::$_" for (qw(Inbox V2Writable Git SolverGit WWW));
my ($inboxdir, $for_destroy) = tmpdir();
my $opts = {
@@ -32,27 +28,21 @@ my $ibx = PublicInbox::Inbox->new($opts);
my $im = PublicInbox::V2Writable->new($ibx, 1);
$im->{parallel} = 0;
-sub deliver_patch ($) {
- open my $fh, '<', $_[0] or die "open: $!";
- my $mime = PublicInbox::MIME->new(do { local $/; <$fh> });
- $im->add($mime);
+my $deliver_patch = sub ($) {
+ $im->add(eml_load($_[0]));
$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 $git = PublicInbox::Git->new($git_dir);
-is('public-inbox 1.0.0',
- $git->commit_title('cb7c42b1e15577ed2215356a2bf925aef59cdd8d'),
- '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];
@@ -96,7 +86,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');
@@ -113,4 +103,100 @@ 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";
+ require PublicInbox::Import;
+ PublicInbox::Import::init_bare($binfoo);
+ 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();