From: Eric Wong <e@80x24.org>
Date: Tue, 17 Sep 2019 08:48:00 +0000 (+0000)
Subject: t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2)
X-Git-Tag: v1.2.0~83
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=96ada3cfad29ff7d1ab2be2474235fc998c239e0

t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2)

Actually do the redirect properly
---

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index c6f78dde..4077a6d1 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -32,8 +32,7 @@ my $psgi = "./t/httpd-corner.psgi";
 my $sock = tcp_server();
 
 # make sure stdin is not a pipe for lsof test to check for leaking pipes
-open(my $null, '<', '/dev/null') or die 'no /dev/null: $!';
-my $rdr = { 0 => fileno($null) };
+open(STDIN, '<', '/dev/null') or die 'no /dev/null: $!';
 
 # Make sure we don't clobber socket options set by systemd or similar
 # using socket activation:
@@ -61,7 +60,7 @@ END { kill 'TERM', $pid if defined $pid };
 my $spawn_httpd = sub {
 	my (@args) = @_;
 	my $cmd = [ $httpd, @args, "--stdout=$out", "--stderr=$err", $psgi ];
-	$pid = spawn_listener(undef, $cmd, [ $sock, $unix ], $rdr);
+	$pid = spawn_listener(undef, $cmd, [ $sock, $unix ]);
 	ok(defined $pid, 'forked httpd process successfully');
 };