public-inbox v1.2.0

[public-inbox.git] / t / spawn.t

diff --git a/t/spawn.t b/t/spawn.t
index 5abedc96b727b186a6bd1998b4cdec980ae24795..aba1a26c7ce66e6571511196d5bcb5b743fe78ee 100644 (file)
--- a/t/spawn.t
+++ b/t/spawn.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -81,17 +81,6 @@ use PublicInbox::Spawn qw(which spawn popen_rd);
        isnt($?, 0, '$? set properly: '.$?);
 }
 
-{
-       my ($fh, $pid) = popen_rd([qw(sleep 60)], undef, { Blocking => 0 });
-       ok(defined $pid && $pid > 0, 'returned pid when array requested');
-       is(kill(0, $pid), 1, 'child process is running');
-       ok(!defined(sysread($fh, my $buf, 1)) && $!{EAGAIN},
-          'sysread returned quickly with EAGAIN');
-       is(kill(9, $pid), 1, 'child process killed early');
-       is(waitpid($pid, 0), $pid, 'child process reapable');
-       isnt($?, 0, '$? set properly: '.$?);
-}
-
 SKIP: {
        eval {
                require BSD::Resource;
@@ -100,7 +89,8 @@ SKIP: {
        my ($r, $w);
        pipe($r, $w) or die "pipe: $!";
        my $cmd = ['sh', '-c', 'while true; do :; done'];
-       my $opt = { RLIMIT_CPU => [ 1, 1 ], RLIMIT_CORE => 0, 1 => fileno($w) };
+       my $fd = fileno($w);
+       my $opt = { RLIMIT_CPU => [ 1, 1 ], RLIMIT_CORE => [ 0, 0 ], 1 => $fd };
        my $pid = spawn($cmd, undef, $opt);
        close $w or die "close(w): $!";
        my $rset = '';