replace most uses of PublicInbox::MIME with Eml

[public-inbox.git] / t / ds-leak.t

diff --git a/t/ds-leak.t b/t/ds-leak.t
index a4a56e0d6fc4e18aa29506d65f78f0185bdf1e06..72bf037937e544940bacd102326ebfde4eba6c67 100644 (file)
--- a/t/ds-leak.t
+++ b/t/ds-leak.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 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>
@@ -6,10 +6,11 @@
 use strict;
 use warnings;
 use Test::More;
+use PublicInbox::TestCommon;
 use_ok 'PublicInbox::DS';
 
 if ('close-on-exec for epoll and kqueue') {
-       use PublicInbox::Spawn qw(spawn);
+       use PublicInbox::Spawn qw(spawn which);
        my $pid;
        my $evfd_re = qr/(?:kqueue|eventpoll)/i;
 
@@ -30,10 +31,12 @@ if ('close-on-exec for epoll and kqueue') {
        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 = 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;
                is_deeply(\@of, [], 'no FDs leaked to subprocess');
        };
        if (defined $pid) {
@@ -44,8 +47,9 @@ if ('close-on-exec for epoll and kqueue') {
 }
 
 SKIP: {
-       # not bothering with BSD::Resource
-       chomp(my $n = `/bin/sh -c 'ulimit -n'`);
+       require_mods('BSD::Resource', 1);
+       my $rlim = BSD::Resource::RLIMIT_NOFILE();
+       my ($n,undef) = BSD::Resource::getrlimit($rlim);
 
        # FreeBSD 11.2 with 2GB RAM gives RLIMIT_NOFILE=57987!
        if ($n > 1024 && !$ENV{TEST_EXPENSIVE}) {