-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 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 strict; use v5.10.1; use PublicInbox::TestCommon;
use_ok 'PublicInbox::DS';
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)
my $l = <$r>;
is($l, undef, 'cloexec works and sleep(1) is running');
- my @of = grep(/$evfd_re/, `lsof -p $pid 2>/dev/null`);
- my $err = $?;
SKIP: {
- skip "lsof missing? (\$?=$err)", 1 if $err;
+ 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 = $?;
+ skip "lsof broken ? (\$?=$err)", 1 if $err;
is_deeply(\@of, [], 'no FDs leaked to subprocess');
};
if (defined $pid) {
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)");