]> Sergey Matveev's repositories - public-inbox.git/commitdiff
t/httpd-unix.t: stop tail(1) before stopping server
authorEric Wong <e@80x24.org>
Mon, 2 Jan 2023 08:18:47 +0000 (08:18 +0000)
committerEric Wong <e@80x24.org>
Mon, 2 Jan 2023 09:02:49 +0000 (09:02 +0000)
When using the `TAIL' environment, the tail(1) process
inherits the non-FD_CLOEXEC pipe we introduced in commit
5f9baf725106 (t/httpd-unix: eliminate some busy waits, 2022-12-12).
We must ensure that pipe is gone before waiting on -httpd's
death by destroying the tail(1) process, first.

t/httpd-unix.t

index c45ff1633f0f68ef148985b330342772d94752d2..414ca0c8b979c5c9b5b12d084f71e508bef5e48a 100644 (file)
@@ -136,6 +136,7 @@ SKIP: {
                my $pid = $read_pid->($pid_file);
                is(kill('TERM', $pid), 1, "signaled daemonized $w process");
                vec(my $rvec = '', fileno($p0), 1) = 1;
+               delete $td->{-extra}; # drop tail(1) process
                is(select($rvec, undef, undef, 1), 1, 'timeout for pipe HUP');
                is(my $undef = <$p0>, undef, 'process closed pipe writer at exit');
                ok(!-e $pid_file, "$w pid file unlinked at exit");