No ext_urls

[public-inbox.git] / t / v2mirror.t

diff --git a/t/v2mirror.t b/t/v2mirror.t
index 37d64e83e53bff264bbc04a5eb4d5f22889b5d1c..c1c66d45a41d4c4c8f2e2ca1cf048ad5b372ddc3 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use v5.10.1;
@@ -330,7 +330,7 @@ SKIP: {
        require_mods('Email::MIME', 1); # for legacy revision
        # using plackup to test old PublicInbox::WWW since -httpd from
        # back then relied on some packages we no longer depend on
-       my $plackup = which('plackup') or skip('no plackup in path', 1);
+       my $plackup = require_cmd('plackup', 1) or skip('no plackup in path', 1);
        require PublicInbox::Lock;
        chomp $oldrev;
        my ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!);
@@ -368,10 +368,11 @@ EOM
        # wait for plackup socket()+bind()+listen()
        my %opt = ( Proto => 'tcp', Type => Socket::SOCK_STREAM(),
                PeerAddr => "$host:$port" );
-       for (0..50) {
+       for (0..100) {
                tick();
                last if IO::Socket::INET->new(%opt);
        }
+       IO::Socket::INET->new(%opt) or xbail "connect $host:$port: $!";
        my $dst = "$tmpdir/scrape";
        @cmd = (qw(-clone -q), "http://$host:$port/v2", $dst);
        run_script(\@cmd, undef, { 2 => \($err = '') });