t/init: convert to using run_script

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

diff --git a/t/spawn.t b/t/spawn.t
index 884042824265b59717d4ca1bc9a6096f50f0807a..ebebfb57eafc078577c4b79bc6021fce8d6c4846 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;
@@ -71,24 +71,13 @@ use PublicInbox::Spawn qw(which spawn popen_rd);
        is($buf, "hello\n", 'tied gets works');
        is(sysread($fh, $buf, 6), 0, 'sysread got EOF');
        $? = 1;
-       close $fh;
+       ok(close($fh), 'close succeeds');
        is($?, 0, '$? set properly');
 }
 
 {
        my $fh = popen_rd([qw(false)]);
-       close $fh;
-       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');
+       ok(!close($fh), 'close fails on false');
        isnt($?, 0, '$? set properly: '.$?);
 }