X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsolver_git.t;h=0090bc06d6165c9fd44ca57745c26b3413cc33e0;hb=ee8746e6db4dbe5a6cdb0d6080f467bc27693b3a;hp=1baa012b1abeb56a77c98519e8a27b08697aafe9;hpb=ea7a1afdb5b4fe417bdc606b8ee73680ce4148bf;p=public-inbox.git
diff --git a/t/solver_git.t b/t/solver_git.t
index 1baa012b..0090bc06 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -1,5 +1,5 @@
#!perl -w
-# Copyright (C) 2019-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
use strict;
use v5.10.1;
@@ -9,7 +9,9 @@ require_git(2.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)});
+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;
@@ -32,6 +34,7 @@ File::Path::mkpath([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';
@@ -244,6 +247,8 @@ SKIP: {
my $cfgpath = "$tmpdir/httpd-config";
open my $cfgfh, '>', $cfgpath or die;
print $cfgfh <{-primary_address}
inboxdir = $ibx->{inboxdir}
@@ -258,6 +263,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 +293,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 +302,131 @@ 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}) {
+ ok(!-s "$tmpdir/stderr.log",
+ '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)');
+ if (ok(-s "$tmpdir/stderr.log")) {
+ open my $fh, '<', "$tmpdir/stderr.log" or xbail $!;
+ my $s = do { local $/; <$fh> };
+ open $fh, '>', "$tmpdir/stderr.log" or xbail $!;
+ ok($s =~ s/^fatal: your current branch.*?\n//sm,
+ 'got current branch warning');
+ ok($s =~ s/^.*? exit status=[1-9]+\n\z//sm,
+ 'got exit status warning');
+ is($s, '', 'no unexpected warnings on empty coderepo');
+ }
+ $res = $cb->(GET('/public-inbox/'));
+ is($res->code, 200, 'coderepo summary (public-inbox)');
+ $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 = XML::TreePP->new->parse($res->content);
+ is(scalar @{$t->{feed}->{entry}}, 50,
+ 'got 50 entries');
+
+ $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');
+
+ $res = $cb->(GET('/public-inbox/atom/README.md'));
+ is($res->code, 404, '404 on non-existent file Atom feed');
+ }
+
+ $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();