X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-unix.t;h=fe4a21616373a682d71020a6be26e7b10b6f76fe;hb=e28f33dc1b6e6a296946c0c58b43900c6cbd07f7;hp=7ebc346414e7074cf3eaae0a01e401fbcc61aa84;hpb=d7270ec79e6347eb1c35ebcdc197e887bb4ef075;p=public-inbox.git
diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 7ebc3464..fe4a2161 100644
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
# Tests for binding Unix domain sockets
use strict;
@@ -42,13 +42,12 @@ for (1..1000) {
ok(-S $unix, 'UNIX socket was bound by -httpd');
sub check_sock ($) {
my ($unix) = @_;
- my $sock = IO::Socket::UNIX->new(Peer => $unix, Type => SOCK_STREAM);
- warn "E: $! connecting to $unix\n" unless defined $sock;
- ok($sock, 'client UNIX socket connected');
+ my $sock = IO::Socket::UNIX->new(Peer => $unix, Type => SOCK_STREAM)
+ // BAIL_OUT "E: $! connecting to $unix";
ok($sock->write("GET /host-port HTTP/1.0\r\n\r\n"),
'wrote req to server');
ok($sock->read(my $buf, 4096), 'read response');
- like($buf, qr!\r\n\r\n127\.0\.0\.1:0\z!,
+ like($buf, qr!\r\n\r\n127\.0\.0\.1 0\z!,
'set REMOTE_ADDR and REMOTE_PORT for Unix socket');
}
@@ -81,17 +80,23 @@ check_sock($unix);
ok(-S $unix, 'unix socket still exists');
}
+# portable Perl can delay or miss signal dispatches due to races,
+# so disable some tests on systems lacking signalfd(2) or EVFILT_SIGNAL
+my $has_sigfd = PublicInbox::Sigfd->new({}, 0) ? 1 : $ENV{TEST_UNRELIABLE};
+
sub delay_until {
my $cond = shift;
- for (1..1000) {
+ my $end = time + 30;
+ do {
return if $cond->();
select undef, undef, undef, 0.012;
- }
- Carp::croak('condition failed');
+ } until (time > $end);
+ Carp::confess('condition failed');
}
SKIP: {
- require_mods('Net::Server::Daemonize', 20);
+ require_mods('Net::Server::Daemonize', 52);
+ $has_sigfd or skip('signalfd / EVFILT_SIGNAL not available', 52);
my $pid_file = "$tmpdir/pid";
my $read_pid = sub {
my $f = shift;
@@ -137,9 +142,11 @@ SKIP: {
});
my $new_pid = $read_pid->($pid_file);
isnt($new_pid, $pid, 'new child started');
+ ok($new_pid > 0, '$new_pid valid');
delay_until(sub { -s "$pid_file.oldbin" });
my $old_pid = $read_pid->("$pid_file.oldbin");
is($old_pid, $pid, '.oldbin pid file written');
+ ok($old_pid > 0, '$old_pid valid');
check_sock($unix); # ensures $new_pid is ready to receive signals