tests: add require_cmd, require curl when needed

[public-inbox.git] / t / lei-externals.t

diff --git a/t/lei-externals.t b/t/lei-externals.t
index 5e3c67bc638ed80ef6f9ff72cf82cc0354d24332..fed57789d05aa1bcd7abc69e0afdd40e0d6849e2 100644 (file)
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -3,7 +3,6 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use Fcntl qw(SEEK_SET);
-use PublicInbox::Spawn qw(which);
 require_git 2.6;
 require_mods(qw(json DBD::SQLite Search::Xapian));
 use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
@@ -17,9 +16,10 @@ my $test_external_remote = sub {
        my ($url, $k) = @_;
 SKIP: {
        skip "$k unset", 1 if !$url;
-       state $curl = which('curl');
-       $curl or skip 'no curl', 1;
-       which('torsocks') or skip 'no torsocks', 1 if $url =~ m!\.onion/!;
+       require_cmd 'curl', 1 or skip 'curl missing', 1;
+       if ($url =~ m!\.onion/!) {
+               require_cmd 'torsocks', 1 or skip 'no torsocks', 1;
+       }
        my $mid = '20140421094015.GA8962@dcvr.yhbt.net';
        my @cmd = ('q', '--only', $url, '-q', "m:$mid");
        lei_ok(@cmd, \"query $url");