* [PATCH 05/17] t/httpd-corner: wait for worker process death
2019-11-24 0:22 5% ` [PATCH 00/17] test fixes and cleanups Eric Wong
@ 2019-11-24 0:22 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-11-24 0:22 UTC (permalink / raw)
To: meta
We need to ensure the worker process is terminated before
starting a new connection, so leave a persistent HTTP/1.1
connection open and wait for the SIGKILL to take effect
and drop the client.
---
t/httpd-corner.psgi | 2 +-
t/httpd-corner.t | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/t/httpd-corner.psgi b/t/httpd-corner.psgi
index bf38d1ff..18e556be 100644
--- a/t/httpd-corner.psgi
+++ b/t/httpd-corner.psgi
@@ -87,7 +87,7 @@ my $app = sub {
});
} elsif ($path eq '/pid') {
$code = 200;
- push @$body, $$;
+ push @$body, "$$\n";
}
[ $code, $h, $body ]
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index b063d9fa..cc36c7e1 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -76,17 +76,22 @@ my $spawn_httpd = sub {
$spawn_httpd->();
if ('test worker death') {
my $conn = conn_for($sock, 'killed worker');
- $conn->write("GET /pid HTTP/1.0\r\n\r\n");
- ok($conn->read(my $buf, 8192), 'read response');
- my ($head, $body) = split(/\r\n\r\n/, $buf);
- like($body, qr/\A[0-9]+\z/, '/pid response');
- my $pid = $body;
+ $conn->write("GET /pid HTTP/1.1\r\nHost:example.com\r\n\r\n");
+ my $pid;
+ while (defined(my $line = $conn->getline)) {
+ next unless $line eq "\r\n";
+ chomp($pid = $conn->getline);
+ last;
+ }
+ like($pid, qr/\A[0-9]+\z/, '/pid response');
is(kill('KILL', $pid), 1, 'killed worker');
+ is($conn->getline, undef, 'worker died and EOF-ed client');
$conn = conn_for($sock, 'respawned worker');
$conn->write("GET /pid HTTP/1.0\r\n\r\n");
- ok($conn->read($buf, 8192), 'read response');
- ($head, $body) = split(/\r\n\r\n/, $buf);
+ ok($conn->read(my $buf, 8192), 'read response');
+ my ($head, $body) = split(/\r\n\r\n/, $buf);
+ chomp($body);
like($body, qr/\A[0-9]+\z/, '/pid response');
isnt($body, $pid, 'respawned worker');
}
^ permalink raw reply related [relevance 7%]
* [PATCH 00/17] test fixes and cleanups
@ 2019-11-24 0:22 5% ` Eric Wong
2019-11-24 0:22 7% ` [PATCH 05/17] t/httpd-corner: wait for worker process death Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-11-24 0:22 UTC (permalink / raw)
To: meta
There's some fixes for race conditions around daemon
startup and shutdown and resurrects start_script for
slightly improved test performance.
And slowly eliminating all END{} block usages
Eric Wong (17):
tests: disable daemon workers in a few more places
tests: use strict everywhere
t/v1-add-remove-add: quiet down "git init"
t/xcpdb-reshard: test xcpdb --compact
t/httpd-corner: wait for worker process death
t/nntpd-tls: sometimes SSL_connect succeeds quickly
.gitignore: ignore local prove(1) files
daemon: use sigprocmask to block signals at startup
daemon: use sigprocmask when respawning workers
daemon: avoid race when quitting workers
t/common: start_script replaces spawn_listener
t/nntpd-validate: get rid of threads dependency
xapcmd: replace Xtmpdirs with File::Temp->newdir
tests: use File::Temp->newdir instead of tempdir()
tests: quiet down commit graph
t/perf-*.t: use $ENV{GIANT_INBOX_DIR} consistently
tests: move giant inbox/git dependent tests to xt/
.gitignore | 2 +
MANIFEST | 11 ++-
lib/PublicInbox/Daemon.pm | 35 +++++--
lib/PublicInbox/Xapcmd.pm | 73 +++++---------
t/.gitconfig | 4 +
t/admin.t | 4 +-
t/altid.t | 4 +-
t/altid_v2.t | 3 +-
t/cgi.t | 3 +-
t/common.perl | 184 ++++++++++++++++++++++++++---------
t/config.t | 4 +-
t/convert-compact.t | 3 +-
t/edit.t | 3 +-
t/emergency.t | 4 +-
t/feed.t | 3 +-
t/filter_rubylang.t | 5 +-
t/git.t | 6 +-
t/html_index.t | 4 +-
t/httpd-corner.psgi | 2 +-
t/httpd-corner.t | 70 +++++++------
t/httpd-https.t | 31 ++----
t/httpd-unix.t | 51 +++++-----
t/httpd.t | 16 ++-
t/import.t | 4 +-
t/indexlevels-mirror.t | 3 +-
t/init.t | 3 +-
t/mda.t | 3 +-
t/mda_filter_rubylang.t | 3 +-
t/mid.t | 1 +
t/msgmap.t | 4 +-
t/nntpd-tls.t | 42 +++-----
t/nntpd.t | 19 ++--
t/nulsubject.t | 4 +-
t/over.t | 4 +-
t/plack.t | 4 +-
t/psgi_attach.t | 4 +-
t/psgi_bad_mids.t | 4 +-
t/psgi_mount.t | 4 +-
t/psgi_multipart_not.t | 4 +-
t/psgi_scan_all.t | 4 +-
t/psgi_search.t | 4 +-
t/psgi_text.t | 4 +-
t/psgi_v2.t | 3 +-
t/purge.t | 4 +-
t/qspawn.t | 1 +
t/replace.t | 6 +-
t/search-thr-index.t | 4 +-
t/search.t | 4 +-
t/solver_git.t | 3 +-
t/spamcheck_spamc.t | 4 +-
t/v1-add-remove-add.t | 6 +-
t/v1reindex.t | 3 +-
t/v2-add-remove-add.t | 3 +-
t/v2mda.t | 3 +-
t/v2mirror.t | 26 ++---
t/v2reindex.t | 3 +-
t/v2writable.t | 13 ++-
t/watch_filter_rubylang.t | 3 +-
t/watch_maildir.t | 5 +-
t/watch_maildir_v2.t | 10 +-
t/www_listing.t | 11 +--
t/xcpdb-reshard.t | 7 +-
{t => xt}/git-http-backend.t | 19 ++--
{t => xt}/nntpd-validate.t | 57 +++++------
{t => xt}/perf-msgview.t | 6 +-
{t => xt}/perf-nntpd.t | 34 +++----
{t => xt}/perf-threading.t | 8 +-
67 files changed, 462 insertions(+), 431 deletions(-)
create mode 100644 t/.gitconfig
rename {t => xt}/git-http-backend.t (87%)
rename {t => xt}/nntpd-validate.t (85%)
rename {t => xt}/perf-msgview.t (85%)
rename {t => xt}/perf-nntpd.t (79%)
rename {t => xt}/perf-threading.t (72%)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-11-16 11:43 [PATCH 29/29] t/common: start_script replaces spawn_listener Eric Wong
2019-11-24 0:22 5% ` [PATCH 00/17] test fixes and cleanups Eric Wong
2019-11-24 0:22 7% ` [PATCH 05/17] t/httpd-corner: wait for worker process death 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).