From 9eac193c72e1380972f3589cb6b4f36b79183233 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 5 Jul 2020 23:27:37 +0000 Subject: wwwatomstream: support async blob fetch This allows -httpd to handle other requests while waiting for git to retrieve and decode blobs. We'll also break apart t/psgi_v2.t further to ensure tests run against -httpd in addition to generic PSGI testing. Using xt/httpd-async-stream.t to test against clones of meta@public-inbox.org shows a 10-12% performance improvement with the following env: TEST_JOBS=1000 TEST_CURL_OPT=--compressed TEST_ENDPOINT=new.atom --- t/psgi_v2.t | 86 ++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 32 deletions(-) (limited to 't') diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 90a710a4..4ab9601c 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -14,6 +14,36 @@ use_ok($_) for (qw(HTTP::Request::Common Plack::Test)); use_ok 'PublicInbox::WWW'; use_ok 'PublicInbox::V2Writable'; my ($inboxdir, $for_destroy) = tmpdir(); +my $cfgpath = "$inboxdir/$$.config"; +SKIP: { + require_mods(qw(Plack::Test::ExternalServer), 1); + open my $fh, '>', $cfgpath or BAIL_OUT $!; + print $fh < $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); + $td->join('TERM'); + open my $fh, '<', $err or BAIL_OUT $!; + is(do { local $/; <$fh> }, '', 'no errors'); + } +}; + my $ibx = { inboxdir => $inboxdir, name => 'test-v2writable', @@ -60,7 +90,7 @@ EOF my $config = PublicInbox::Config->new(\$cfg); my $www = PublicInbox::WWW->new($config); my ($res, $raw, @from_); -test_psgi(sub { $www->call(@_) }, sub { +my $client0 = sub { my ($cb) = @_; $res = $cb->(GET('/v2test/description')); like($res->content, qr!\$INBOX_DIR/description missing!, @@ -90,7 +120,9 @@ test_psgi(sub { $www->call(@_) }, sub { @bodies = ($res->content =~ /^(hello [^<]+)$/mg); is_deeply(\@bodies, [ "hello world!\n", "hello world\n" ], 'new.html ordering is chronological'); -}); +}; +test_psgi(sub { $www->call(@_) }, $client0); +$run_httpd->($client0, 9); $mime->header_set('Message-Id', 'a-mid@b'); $mime->body_set("hello ghosts\n"); @@ -103,7 +135,7 @@ $mids = mids($mime->header_obj); my $third = $mids->[-1]; $im->done; -my $client = sub { +my $client1 = sub { my ($cb) = @_; $res = $cb->(GET("/v2test/$third/raw")); $raw = $res->content; @@ -196,32 +228,10 @@ my $client = sub { like($raw, qr/\b3\+ messages\b/, 'thread overview shown'); }; -test_psgi(sub { $www->call(@_) }, $client); -SKIP: { - require_mods(qw(Plack::Test::ExternalServer), 37); - my $cfgpath = "$inboxdir/$$.config"; - open my $fh, '>', $cfgpath or BAIL_OUT $!; - print $fh < $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); - $td->join('TERM'); - open $fh, '<', $err or BAIL_OUT $!; - is(do { local $/; <$fh> }, '', 'no errors'); -}; +test_psgi(sub { $www->call(@_) }, $client1); +$run_httpd->($client1, 38); -test_psgi(sub { $www->call(@_) }, sub { - my ($cb) = @_; +{ my $exp = [ qw( ) ]; $mime->header_set('Message-Id', @$exp); $mime->header_set('Subject', '4th dupe'); @@ -230,10 +240,12 @@ test_psgi(sub { $www->call(@_) }, sub { $im->done; my @h = $mime->header('Message-ID'); is_deeply($exp, \@h, 'reused existing Message-ID'); - $config->each_inbox(sub { $_[0]->search->reopen }); +} - $res = $cb->(GET('/v2test/new.atom')); +my $client2 = sub { + my ($cb) = @_; + my $res = $cb->(GET('/v2test/new.atom')); my @ids = ($res->content =~ m!urn:uuid:([^<]+)!sg); my %ids; $ids{$_}++ for @ids; @@ -256,7 +268,11 @@ test_psgi(sub { $www->call(@_) }, sub { is($res->code, 200, 'got info refs for dumb clones w/ .git suffix'); $res = $cb->(GET('/v2test/info/refs')); is($res->code, 404, 'v2 git URL w/o shard fails'); +}; +test_psgi(sub { $www->call(@_) }, $client2); +$run_httpd->($client2, 8); +{ # ensure conflicted attachments can be resolved foreach my $body (qw(old new)) { $mime = eml_load "t/psgi_v2-$body.eml"; @@ -264,7 +280,11 @@ test_psgi(sub { $www->call(@_) }, sub { } $im->done; $config->each_inbox(sub { $_[0]->search->reopen }); - $res = $cb->(GET('/v2test/a@dup/')); +} + +my $client3 = sub { + my ($cb) = @_; + my $res = $cb->(GET('/v2test/a@dup/')); my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g); is(scalar(@links), 2, 'both attachment links exist'); isnt($links[0], $links[1], 'attachment links are different'); @@ -276,7 +296,9 @@ test_psgi(sub { $www->call(@_) }, sub { } $res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000')); is($res->code, 404, '404 for out-of-range t= param'); -}); +}; +test_psgi(sub { $www->call(@_) }, $client3); +$run_httpd->($client3, 4); done_testing(); -- cgit v1.2.3-24-ge0c7