No ext_urls

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

diff --git a/t/ds-leak.t b/t/ds-leak.t
index dd8446dcd1f77e0f9a2d167ab0c057c917a443bb..4e8d76cdf2eafdabbe4bce03e8ad7449a3ada3e2 100644 (file)
--- a/t/ds-leak.t
+++ b/t/ds-leak.t
@@ -1,11 +1,9 @@
-# Copyright (C) 2019 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') {
@@ -15,13 +13,27 @@ if ('close-on-exec for epoll and kqueue') {
 
        PublicInbox::DS->SetLoopTimeout(0);
        PublicInbox::DS->SetPostLoopCallback(sub { 0 });
-       PublicInbox::DS->AddTimer(0, sub { $pid = spawn([qw(sleep 10)]) });
-       PublicInbox::DS->EventLoop;
+
+       # 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::event_loop();
        ok($pid, 'subprocess spawned');
-       my @of = grep(/$evfd_re/, `lsof -p $pid 2>/dev/null`);
-       my $err = $?;
+
+       # wait for execve, we need to ensure lsof sees sleep(1)
+       # and not the fork of this process:
+       close $w or die "close: $!";
+       my $l = <$r>;
+       is($l, undef, 'cloexec works and sleep(1) is running');
+
        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) {
@@ -32,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}) {
@@ -43,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)");