user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] t/httpd-unix: improve test reliability
@ 2020-04-07 21:02 Eric Wong
  0 siblings, 0 replies; only message in thread
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	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-07 21:02 [PATCH] t/httpd-unix: improve test reliability Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git