* [PATCH 2/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2)
2019-09-17 8:50 5% [PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe Eric Wong
2019-09-17 8:50 7% ` [PATCH 1/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe Eric Wong
@ 2019-09-17 8:51 7% ` Eric Wong
1 sibling, 0 replies; 3+ results
From: Eric Wong @ 2019-09-17 8:51 UTC (permalink / raw)
To: meta
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');
};
^ permalink raw reply related [relevance 7%]
* [PATCH 1/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe
2019-09-17 8:50 5% [PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe Eric Wong
@ 2019-09-17 8:50 7% ` Eric Wong
2019-09-17 8:51 7% ` [PATCH 2/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2) Eric Wong
1 sibling, 0 replies; 3+ results
From: Eric Wong @ 2019-09-17 8:50 UTC (permalink / raw)
To: meta
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');
};
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe
@ 2019-09-17 8:50 5% Eric Wong
2019-09-17 8:50 7% ` [PATCH 1/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe Eric Wong
2019-09-17 8:51 7% ` [PATCH 2/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2) Eric Wong
0 siblings, 2 replies; 3+ results
From: Eric Wong @ 2019-09-17 8:50 UTC (permalink / raw)
To: meta
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(+)
^ permalink raw reply [relevance 5%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-09-17 8:50 5% [PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe Eric Wong
2019-09-17 8:50 7% ` [PATCH 1/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe Eric Wong
2019-09-17 8:51 7% ` [PATCH 2/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2) Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).