From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/5] t/httpd-corner.t: get rid of IPC::Run for running curl
Date: Mon, 4 Nov 2019 03:01:35 +0000 [thread overview]
Message-ID: <20191104030137.4301-4-e@80x24.org> (raw)
In-Reply-To: <20191104030137.4301-1-e@80x24.org>
We already load PublicInbox::Spawn, so there's no need to
add another dependency to make life difficult for potential
contributors.
---
t/httpd-corner.t | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 50aa28e3..13c0c2db 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -6,10 +6,9 @@ use strict;
use warnings;
use Test::More;
use Time::HiRes qw(gettimeofday tv_interval);
-use PublicInbox::Spawn qw(which);
+use PublicInbox::Spawn qw(which spawn);
-foreach my $mod (qw(Plack::Util Plack::Builder
- HTTP::Date HTTP::Status IPC::Run)) {
+foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
eval "require $mod";
plan skip_all => "$mod missing for httpd-corner.t" if $@;
}
@@ -250,19 +249,21 @@ SKIP: {
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
my $cmd = [qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url];
- my ($out, $err) = ('', '');
- my $h = IPC::Run::start($cmd, $r, \$out, \$err);
- $w->autoflush(1);
+ open my $cout, '+>', undef or die;
+ open my $cerr, '>', undef or die;
+ my $rdr = { 0 => fileno($r), 1 => fileno($cout), 2 => fileno($cerr) };
+ my $pid = spawn($cmd, undef, $rdr);
+ close $r or die "close read pipe: $!";
foreach my $c ('a'..'z') {
print $w $c or die "failed to write to curl: $!";
delay();
}
close $w or die "close write pipe: $!";
- close $r or die "close read pipe: $!";
- IPC::Run::finish($h);
+ waitpid($pid, 0);
is($?, 0, 'curl exited successfully');
- is($err, '', 'no errors from curl');
- is($out, sha1_hex($str), 'read expected body');
+ is(-s $cerr, 0, 'no errors from curl');
+ $cout->seek(0, SEEK_SET);
+ is(<$cout>, sha1_hex($str), 'read expected body');
open my $fh, '-|', qw(curl -sS), "$base/async-big" or die $!;
my $n = 0;
next prev parent reply other threads:[~2019-11-04 3:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-04 3:01 [PATCH 0/5] tiny test overhead reductions Eric Wong
2019-11-04 3:01 ` [PATCH 1/5] t/*.t: remove IPC::Run dependency for git commands Eric Wong
2019-11-04 3:01 ` [PATCH 2/5] t/httpd-corner.t: drop unnecessary bytes:: for length() Eric Wong
2019-11-04 3:01 ` Eric Wong [this message]
2019-11-04 3:01 ` [PATCH 4/5] t/hl_mod.t: remove IPC::Run (and File::Temp) dependency Eric Wong
2019-11-04 3:01 ` [PATCH 5/5] t/*.t: disable nntpd/httpd worker processes in most tests Eric Wong
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=20191104030137.4301-4-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.
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).