diff options
Diffstat (limited to 't/ds-leak.t')
| -rw-r--r-- | t/ds-leak.t | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/t/ds-leak.t b/t/ds-leak.t index 57d9cd72..f39985e0 100644 --- a/t/ds-leak.t +++ b/t/ds-leak.t @@ -1,28 +1,25 @@ -# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # Licensed the same as Danga::Socket (and Perl5) # License: GPL-1.0+ or Artistic-1.0-Perl # <https://www.gnu.org/licenses/gpl-1.0.txt> # <https://dev.perl.org/licenses/artistic.html> -use strict; -use warnings; -use Test::More; -use PublicInbox::TestCommon; +use v5.12; use PublicInbox::TestCommon; use_ok 'PublicInbox::DS'; if ('close-on-exec for epoll and kqueue') { - use PublicInbox::Spawn qw(spawn which); + use PublicInbox::Spawn qw(spawn); my $pid; my $evfd_re = qr/(?:kqueue|eventpoll)/i; - PublicInbox::DS->SetLoopTimeout(0); - PublicInbox::DS->SetPostLoopCallback(sub { 0 }); + $PublicInbox::DS::loop_timeout = 0; + local @PublicInbox::DS::post_loop_do = (sub { 0 }); # make sure execve closes if we're using fork() my ($r, $w); pipe($r, $w) or die "pipe: $!"; PublicInbox::DS::add_timer(0, sub { $pid = spawn([qw(sleep 10)]) }); - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); ok($pid, 'subprocess spawned'); # wait for execve, we need to ensure lsof sees sleep(1) @@ -32,11 +29,8 @@ if ('close-on-exec for epoll and kqueue') { is($l, undef, 'cloexec works and sleep(1) is running'); SKIP: { - my $lsof = which('lsof') or skip 'lsof missing', 1; my $rdr = { 2 => \(my $null) }; - my @of = grep(/$evfd_re/, xqx([$lsof, '-p', $pid], {}, $rdr)); - my $err = $?; - skip "lsof broken ? (\$?=$err)", 1 if $err; + my @of = grep /$evfd_re/, lsof_pid $pid, $rdr; is_deeply(\@of, [], 'no FDs leaked to subprocess'); }; if (defined $pid) { @@ -57,9 +51,9 @@ SKIP: { } my $cb = sub {}; for my $i (0..$n) { - PublicInbox::DS->SetLoopTimeout(0); - PublicInbox::DS->SetPostLoopCallback($cb); - PublicInbox::DS->EventLoop; + $PublicInbox::DS::loop_timeout = 0; + local @PublicInbox::DS::post_loop_do = ($cb); + PublicInbox::DS::event_loop(); PublicInbox::DS->Reset; } ok(1, "Reset works and doesn't hit RLIMIT_NOFILE ($n)"); |