t/httpd-corner: use which() sub for detecting curl(1)

[public-inbox.git] / t / httpd-corner.t

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index c72bc9c6368cc2b3f6fb2f49045cb374ffe96a56..f5937e7640187a525245927965204667174f54a0 100644 (file)
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -6,6 +6,7 @@ use strict;
 use warnings;
 use Test::More;
 use Time::HiRes qw(gettimeofday tv_interval);
+use PublicInbox::Spawn qw(which);
 
 foreach my $mod (qw(Plack::Util Plack::Builder
                        HTTP::Date HTTP::Status IPC::Run)) {
@@ -240,14 +241,7 @@ my $check_self = sub {
 };
 
 SKIP: {
-       my $have_curl = 0;
-       foreach my $p (split(':', $ENV{PATH})) {
-               -x "$p/curl" or next;
-               $have_curl = 1;
-               last;
-       }
-       my $ntest = 4;
-       $have_curl or skip('curl(1) missing', $ntest);
+       which('curl') or skip('curl(1) missing', 4);
        my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
        my $url = "$base/sha1";
        my ($r, $w);
@@ -526,6 +520,13 @@ SKIP: {
        defined(my $x = getsockopt($sock, SOL_SOCKET, $var)) or die;
        is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
 };
+SKIP: {
+       skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
+       skip 'no lsof in PATH', 1 unless which('lsof');
+       my @lsof = `lsof -p $pid`;
+       is_deeply([grep(/\bdeleted\b/, @lsof)], [], 'no lingering deleted inputs');
+       is_deeply([grep(/\bpipe\b/, @lsof)], [], 'no extra pipes with -W0');
+};
 
 done_testing();