* [PATCH 2/6] viewvcs: flesh out some functionality and test
2019-12-18 3:36 6% [PATCH 0/6] test updates and speedups Eric Wong
@ 2019-12-18 3:36 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-12-18 3:36 UTC (permalink / raw)
To: meta
Expose MAX_SIZE via "our" will make it possible
to use in tests, and configure, later.
Additionally, returning HTTP 500 code for big files is not an
Internal Server Error, just a memory limit... Some browsers
won't show our HTML response with the link to the raw file in
case of errors, either, so we'll return 200 to ensure users can
use the link to access the raw blob.
Finally, throw in some tests to the existing solver_git testcase,
since that was incomplete and was pointlessly loading Plack
modules without testing PSGI.
---
lib/PublicInbox/ViewVCS.pm | 8 ++--
t/solver_git.t | 77 +++++++++++++++++++++++++++++++++++---
2 files changed, 76 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 369afe93..842c873c 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -28,7 +28,7 @@ my $hl = eval {
};
my %QP_MAP = ( A => 'oid_a', B => 'oid_b', a => 'path_a', b => 'path_b' );
-my $max_size = 1024 * 1024; # TODO: configurable
+our $MAX_SIZE = 1024 * 1024; # TODO: configurable
my $BIN_DETECT = 8000; # same as git
sub html_page ($$$) {
@@ -76,7 +76,7 @@ sub stream_large_blob ($$$$) {
sub show_other ($$$$) {
my ($ctx, $res, $logref, $fn) = @_;
my ($git, $oid, $type, $size) = @$res;
- if ($size > $max_size) {
+ if ($size > $MAX_SIZE) {
$$logref = "$oid is too big to show\n" . $$logref;
return html_page($ctx, 200, $logref);
}
@@ -122,11 +122,11 @@ sub solve_result {
return show_other($ctx, $res, \$log, $fn) if $type ne 'blob';
my $path = to_filename($di->{path_b} || $hints->{path_b} || 'blob');
my $raw_link = "(<a\nhref=$path>raw</a>)";
- if ($size > $max_size) {
+ if ($size > $MAX_SIZE) {
return stream_large_blob($ctx, $res, \$log, $fn) if defined $fn;
$log = "<pre><b>Too big to show, download available</b>\n" .
"$oid $type $size bytes $raw_link</pre>" . $log;
- return html_page($ctx, 500, \$log);
+ return html_page($ctx, 200, \$log);
}
my $blob = $git->cat_file($oid);
diff --git a/t/solver_git.t b/t/solver_git.t
index 9bda157d..6bac17ea 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -6,9 +6,9 @@ use Test::More;
use Cwd qw(abs_path);
require './t/common.perl';
require_git(2.6);
+use PublicInbox::Spawn qw(spawn);
-my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
- URI::Escape Plack::Builder);
+my @mods = qw(DBD::SQLite Search::Xapian);
foreach my $mod (@mods) {
eval "require $mod";
plan skip_all => "$mod missing for $0" if $@;
@@ -19,7 +19,7 @@ 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 ($inboxdir, $for_destroy) = tmpdir();
my $opts = {
@@ -40,10 +40,10 @@ sub deliver_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'),
+ $git->commit_title($v1_0_0_tag),
'commit_title works on 1.0.0');
is(undef, $git->commit_title('impossible'), 'undef on impossible object');
@@ -113,4 +113,71 @@ 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: {
+ my @missing;
+ for my $mod (@psgi) {
+ eval("require $mod") or push(@missing, $mod);
+ }
+ skip("missing: ".join(', ', @missing), 7 + scalar(@psgi)) if @missing;
+ 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 => fileno($rin), 1 => fileno($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 $cfg = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$ibx->{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
+EOF
+ my $www = PublicInbox::WWW->new($cfg);
+ test_psgi(sub { $www->call(@_) }, 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/$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");
+ }
+ });
+}
+
done_testing();
^ permalink raw reply related [relevance 7%]
* [PATCH 0/6] test updates and speedups
@ 2019-12-18 3:36 6% Eric Wong
2019-12-18 3:36 7% ` [PATCH 2/6] viewvcs: flesh out some functionality and test Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-12-18 3:36 UTC (permalink / raw)
To: meta
Tests are now faster with the "make check-run" target by
avoiding Perl startup time for each *.t file.
"make check-run" is nearly 3x faster than "make check"
under 1.2.0 due to the dozens of internal improvements
and cleanups since 1.2.0.
I've also beefed up the "solver" tests to cover the ViewVCS
PSGI frontend, more work there on the horizon...
Eric Wong (6):
TODO: add UUCP address item
viewvcs: flesh out some functionality and test
Makefile.PL: sort target and var lists
t/*.t: avoid sharing "my" variables in subs
tests: move t/common.perl to PublicInbox::TestCommon
t/run.perl: to avoid repeated process spawning for *.t
.gitignore | 1 +
MANIFEST | 3 +-
Makefile.PL | 20 +-
TODO | 2 +
.../PublicInbox/TestCommon.pm | 28 ++-
lib/PublicInbox/ViewVCS.pm | 8 +-
t/admin.t | 2 +-
t/altid.t | 2 +-
t/altid_v2.t | 2 +-
t/cgi.t | 2 +-
t/config.t | 2 +-
t/convert-compact.t | 2 +-
t/edit.t | 2 +-
t/emergency.t | 2 +-
t/feed.t | 2 +-
t/filter_rubylang.t | 2 +-
t/git.t | 2 +-
t/html_index.t | 2 +-
t/httpd-corner.t | 10 +-
t/httpd-https.t | 2 +-
t/httpd-unix.t | 2 +-
t/httpd.t | 2 +-
t/import.t | 2 +-
t/indexlevels-mirror.t | 12 +-
t/init.t | 2 +-
t/mda.t | 48 ++---
t/mda_filter_rubylang.t | 2 +-
t/msgmap.t | 2 +-
t/nntpd-tls.t | 4 +-
t/nntpd.t | 5 +-
t/nulsubject.t | 2 +-
t/over.t | 2 +-
t/plack.t | 2 +-
t/psgi_attach.t | 2 +-
t/psgi_bad_mids.t | 2 +-
t/psgi_mount.t | 2 +-
t/psgi_multipart_not.t | 2 +-
t/psgi_scan_all.t | 2 +-
t/psgi_search.t | 2 +-
t/psgi_text.t | 2 +-
t/psgi_v2.t | 2 +-
t/purge.t | 2 +-
t/replace.t | 2 +-
t/run.perl | 182 ++++++++++++++++++
t/search-thr-index.t | 2 +-
t/search.t | 2 +-
t/solver_git.t | 86 ++++++++-
t/spamcheck_spamc.t | 2 +-
t/v1-add-remove-add.t | 2 +-
t/v1reindex.t | 2 +-
t/v2-add-remove-add.t | 2 +-
t/v2mda.t | 2 +-
t/v2mirror.t | 12 +-
t/v2reindex.t | 2 +-
t/v2writable.t | 2 +-
t/view.t | 12 +-
t/watch_filter_rubylang.t | 2 +-
t/watch_maildir.t | 2 +-
t/watch_maildir_v2.t | 2 +-
t/www_listing.t | 6 +-
t/xcpdb-reshard.t | 2 +-
xt/git-http-backend.t | 2 +-
xt/nntpd-validate.t | 2 +-
xt/perf-msgview.t | 2 +-
xt/perf-nntpd.t | 2 +-
65 files changed, 404 insertions(+), 133 deletions(-)
rename t/common.perl => lib/PublicInbox/TestCommon.pm (90%)
create mode 100755 t/run.perl
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-12-18 3:36 6% [PATCH 0/6] test updates and speedups Eric Wong
2019-12-18 3:36 7% ` [PATCH 2/6] viewvcs: flesh out some functionality and test Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).