From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 4642C1F4C4
	for <meta@public-inbox.org>; Mon,  4 Nov 2019 03:01:38 +0000 (UTC)
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
Message-Id: <20191104030137.4301-4-e@80x24.org>
In-Reply-To: <20191104030137.4301-1-e@80x24.org>
References: <20191104030137.4301-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.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;