From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe (try #2)
Date: Tue, 17 Sep 2019 08:51:00 +0000 [thread overview]
Message-ID: <20190917085100.14785-3-e@80x24.org> (raw)
In-Reply-To: <20190917085100.14785-1-e@80x24.org>
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');
};
prev parent reply other threads:[~2019-09-17 8:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 8:50 [PATCH 0/2] t/httpd-corner.t: fix lsof test when stdin pipe Eric Wong
2019-09-17 8:50 ` [PATCH 1/2] t/httpd-corner.t: don't fail lsof test if stdin is a pipe Eric Wong
2019-09-17 8:51 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190917085100.14785-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).