X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fds-leak.t;h=4e8d76cdf2eafdabbe4bce03e8ad7449a3ada3e2;hb=dfb7216697548f294259cb010c26416cdbbe0ff0;hp=72bf037937e544940bacd102326ebfde4eba6c67;hpb=4bebfa0c80ad7f4596a7dca98b39121470a42af0;p=public-inbox.git
diff --git a/t/ds-leak.t b/t/ds-leak.t
index 72bf0379..4e8d76cd 100644
--- a/t/ds-leak.t
+++ b/t/ds-leak.t
@@ -1,16 +1,13 @@
-# Copyright (C) 2019-2020 all contributors
+# Copyright (C) 2019-2021 all contributors
# Licensed the same as Danga::Socket (and Perl5)
# License: GPL-1.0+ or Artistic-1.0-Perl
#
#
-use strict;
-use warnings;
-use Test::More;
-use PublicInbox::TestCommon;
+use strict; use v5.10.1; 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;
@@ -22,7 +19,7 @@ if ('close-on-exec for epoll and kqueue') {
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,7 +29,7 @@ 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 $lsof = require_cmd('lsof', 1) or skip 'lsof missing', 1;
my $rdr = { 2 => \(my $null) };
my @of = grep(/$evfd_re/, xqx([$lsof, '-p', $pid], {}, $rdr));
my $err = $?;
@@ -59,7 +56,7 @@ SKIP: {
for my $i (0..$n) {
PublicInbox::DS->SetLoopTimeout(0);
PublicInbox::DS->SetPostLoopCallback($cb);
- PublicInbox::DS->EventLoop;
+ PublicInbox::DS::event_loop();
PublicInbox::DS->Reset;
}
ok(1, "Reset works and doesn't hit RLIMIT_NOFILE ($n)");