X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fds-leak.t;h=4e8d76cdf2eafdabbe4bce03e8ad7449a3ada3e2;hb=2f8d15b1170b137a0512a4f3163b236a5dcbf0b8;hp=ea0eeaa651b06eb4e0636f4ba8d74cd440d73c57;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git

diff --git a/t/ds-leak.t b/t/ds-leak.t
index ea0eeaa6..4e8d76cd 100644
--- a/t/ds-leak.t
+++ b/t/ds-leak.t
@@ -1,11 +1,9 @@
-# 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 strict; use v5.10.1; use PublicInbox::TestCommon;
 use_ok 'PublicInbox::DS';
 
 if ('close-on-exec for epoll and kqueue') {
@@ -21,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)
@@ -30,10 +28,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 = 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) {
@@ -44,8 +44,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}) {
@@ -55,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)");