X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsigfd.t;h=a68b12a65f01d8f5b36f0592acb8cf1a128a38cc;hb=88c7c7c26b44ee4c1141fddb628a518b4d4d21a4;hp=07120b64c68bae33955ab3105259bb493ec866b7;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git
diff --git a/t/sigfd.t b/t/sigfd.t
index 07120b64..a68b12a6 100644
--- a/t/sigfd.t
+++ b/t/sigfd.t
@@ -1,20 +1,18 @@
-# Copyright (C) 2019-2020 all contributors
+# Copyright (C) 2019-2021 all contributors
use strict;
use Test::More;
use IO::Handle;
use POSIX qw(:signal_h);
use Errno qw(ENOSYS);
-use PublicInbox::Syscall qw(SFD_NONBLOCK);
require_ok 'PublicInbox::Sigfd';
+use PublicInbox::DS;
SKIP: {
if ($^O ne 'linux' && !eval { require IO::KQueue }) {
skip 'signalfd requires Linux or IO::KQueue to emulate', 10;
}
- my $new = POSIX::SigSet->new;
- $new->fillset or die "sigfillset: $!";
- my $old = POSIX::SigSet->new;
- sigprocmask(SIG_SETMASK, $new, $old) or die "sigprocmask $!";
+
+ my $old = PublicInbox::DS::block_signals();
my $hit = {};
my $sig = {};
local $SIG{HUP} = sub { $hit->{HUP}->{normal}++ };
@@ -25,7 +23,6 @@ SKIP: {
}
my $sigfd = PublicInbox::Sigfd->new($sig, 0);
if ($sigfd) {
- require PublicInbox::DS;
ok($sigfd, 'Sigfd->new works');
kill('HUP', $$) or die "kill $!";
kill('INT', $$) or die "kill $!";
@@ -42,17 +39,18 @@ SKIP: {
}
$sigfd = undef;
- my $nbsig = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
+ my $nbsig = PublicInbox::Sigfd->new($sig, 1);
ok($nbsig, 'Sigfd->new SFD_NONBLOCK works');
is($nbsig->wait_once, undef, 'nonblocking ->wait_once');
ok($! == Errno::EAGAIN, 'got EAGAIN');
kill('HUP', $$) or die "kill $!";
PublicInbox::DS->SetPostLoopCallback(sub {}); # loop once
- PublicInbox::DS->EventLoop;
- is($hit->{HUP}->{sigfd}, 2, 'HUP sigfd fired in event loop');
+ PublicInbox::DS::event_loop();
+ is($hit->{HUP}->{sigfd}, 2, 'HUP sigfd fired in event loop') or
+ diag explain($hit); # sometimes fails on FreeBSD 11.x
kill('TERM', $$) or die "kill $!";
kill('HUP', $$) or die "kill $!";
- PublicInbox::DS->EventLoop;
+ PublicInbox::DS::event_loop();
PublicInbox::DS->Reset;
is($hit->{TERM}->{sigfd}, 1, 'TERM sigfd fired in event loop');
is($hit->{HUP}->{sigfd}, 3, 'HUP sigfd fired in event loop');