[PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe

[PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe

[Eric Wong]

This was two commits because I'm too sleepy to be allowed to push
anything :x

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

 t/httpd-corner.t | 3 +++
 1 file changed, 3 insertions(+)

[PATCH 1/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe

[Eric Wong]

We don't want the stdin from the test runner to accidentally
cause this test to fail.
---
 t/httpd-corner.t | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index f5937e76..c6f78dde 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -31,6 +31,10 @@ my $httpd = 'blib/script/public-inbox-httpd';
 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) };
+
 # Make sure we don't clobber socket options set by systemd or similar
 # using socket activation:
 my ($defer_accept_val, $accf_arg);
@@ -57,7 +61,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 ]);
+	$pid = spawn_listener(undef, $cmd, [ $sock, $unix ], $rdr);
 	ok(defined $pid, 'forked httpd process successfully');
 };
 

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

[Eric Wong]

Actually do the redirect properly
---
 t/httpd-corner.t | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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');
 };