From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 34B0A1F5AD for ; Tue, 7 Apr 2020 21:02:30 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] t/httpd-unix: improve test reliability Date: Tue, 7 Apr 2020 21:02:30 +0000 Message-Id: <20200407210230.19722-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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');