* [PATCH] t/httpd-unix: improve test reliability
@ 2020-04-07 21:02 7% Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2020-04-07 21:02 UTC (permalink / raw)
To: meta
Net::Server::Daemonize::create_pid_file does not
write the PID file atomically, so we need to barf
if it's incomplete.
---
t/httpd-unix.t | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index a0fe1e31..7ebc3464 100644
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -97,8 +97,8 @@ SKIP: {
my $f = shift;
open my $fh, '<', $f or die "open $f failed: $!";
my $pid = do { local $/; <$fh> };
- chomp $pid;
- $pid || 0;
+ chomp($pid) or die("pid file not ready $!");
+ $pid;
};
for my $w (qw(-W0 -W1)) {
@@ -107,8 +107,7 @@ SKIP: {
$td->join;
is($?, 0, "daemonized $w process");
check_sock($unix);
-
- ok(-f $pid_file, "$w pid file written");
+ ok(-s $pid_file, "$w pid file written");
my $pid = $read_pid->($pid_file);
is(kill('TERM', $pid), 1, "signaled daemonized $w process");
delay_until(sub { !kill(0, $pid) });
@@ -126,6 +125,7 @@ SKIP: {
$td->join;
is($?, 0, "daemonized process again");
check_sock($unix);
+ ok(-s $pid_file, 'pid file written');
my $pid = $read_pid->($pid_file);
# stop worker to ensure check_sock below hits $new_pid
@@ -137,6 +137,7 @@ SKIP: {
});
my $new_pid = $read_pid->($pid_file);
isnt($new_pid, $pid, 'new child started');
+ delay_until(sub { -s "$pid_file.oldbin" });
my $old_pid = $read_pid->("$pid_file.oldbin");
is($old_pid, $pid, '.oldbin pid file written');
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-04-07 21:02 7% [PATCH] t/httpd-unix: improve test reliability 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).