X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhttpd-corner.t;h=5dc5734e96d1cb77028641c1ca47e0ad20afe0e8;hb=702864ea3393f4c7a91336b277083bf9fd4b0860;hp=794d8aebe7ca0414a22492bb747778784e839723;hpb=860169adcd29341142b7c4a369c09b4ac492bd1e;p=public-inbox.git

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 794d8aeb..5dc5734e 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -2,12 +2,9 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # note: our HTTP server should be standalone and capable of running
 # generic PSGI/Plack apps.
-use strict;
-use warnings;
-use Test::More;
+use strict; use v5.10.1; use PublicInbox::TestCommon;
 use Time::HiRes qw(gettimeofday tv_interval);
-use PublicInbox::Spawn qw(which spawn popen_rd);
-use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(spawn popen_rd);
 require_mods(qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status));
 use Digest::SHA qw(sha1_hex);
 use IO::Handle ();
@@ -303,7 +300,7 @@ my $check_self = sub {
 };
 
 SKIP: {
-	my $curl = which('curl') or skip('curl(1) missing', 4);
+	my $curl = require_cmd('curl', 1) or skip('curl(1) missing', 4);
 	my $base = 'http://'.tcp_host_port($sock);
 	my $url = "$base/sha1";
 	my ($r, $w);
@@ -606,11 +603,12 @@ SKIP: {
 
 SKIP: {
 	skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
-	my $lsof = which('lsof') or skip 'no lsof in PATH', 1;
+	my $lsof = require_cmd('lsof', 1) or skip 'no lsof in PATH', 1;
 	my $null_in = '';
 	my $rdr = { 2 => \(my $null_err), 0 => \$null_in };
 	my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $rdr);
-	is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+	my $d = [ grep(/\(deleted\)/, @lsof) ];
+	is_deeply($d, [], 'no lingering deleted inputs') or diag explain($d);
 
 	# filter out pipes inherited from the parent
 	my @this = xqx([$lsof, '-p', $$], undef, $rdr);