From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] t/httpd-unix: improve test reliability
Date: Tue, 7 Apr 2020 21:02:30 +0000 [thread overview]
Message-ID: <20200407210230.19722-1-e@yhbt.net> (raw)
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');
reply other threads:[~2020-04-07 21:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200407210230.19722-1-e@yhbt.net \
--to=e@yhbt.net \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).