tests: use test_httpd consistently

This allows us to consolidate our checks for
Plack::Test::ExternalServer and enforce our redirect-disabled
LWP::UserAgent.

5 files changed, 23 insertions, 52 deletions

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 333791b4..abf4f364 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -743,11 +743,14 @@ sub create_inbox ($$;@) {
         $ibx;
 }
 
-sub test_httpd ($$;$) {
-        my ($env, $client, $skip) = @_;
-        for (qw(PI_CONFIG TMPDIR)) {
-                $env->{$_} or BAIL_OUT "$_ unset";
-        }
+sub test_httpd ($$;$$) {
+        my ($env, $client, $skip, $cb) = @_;
+        my ($tmpdir, $for_destroy);
+        $env->{TMPDIR} //= do {
+                ($tmpdir, $for_destroy) = tmpdir();
+                $tmpdir;
+        };
+        for (qw(PI_CONFIG)) { $env->{$_} or BAIL_OUT "$_ unset" }
         SKIP: {
                 require_mods(qw(Plack::Test::ExternalServer LWP::UserAgent),
                                 $skip // 1);
@@ -761,6 +764,7 @@ sub test_httpd ($$;$) {
                 $ua->max_redirect(0);
                 Plack::Test::ExternalServer::test_psgi(client => $client,
                                                         ua => $ua);
+                $cb->() if $cb;
                 $td->join('TERM');
                 open my $fh, '<', $err or BAIL_OUT $!;
                 my $e = do { local $/; <$fh> };
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 79665d6f..db551696 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2016-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;
@@ -97,19 +97,12 @@ my $client = sub {
 
 test_psgi(sub { $www->call(@_) }, $client);
 SKIP: {
-        require_mods(qw(DBD::SQLite Plack::Test::ExternalServer), 18);
+        require_mods(qw(DBD::SQLite), 18);
         $ibx = create_inbox 'test-indexed', indexlevel => 'basic', $creat_cb;
         $cfgpath = "$ibx->{inboxdir}/pi_config";
         my $env = { PI_CONFIG => $cfgpath };
         $www = PublicInbox::WWW->new(PublicInbox::Config->new($cfgpath));
         test_psgi(sub { $www->call(@_) }, $client);
-        my $sock = tcp_server() or die;
-        my ($tmpdir, $for_destroy) = tmpdir();
-        my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
-        my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
-        my $td = start_script($cmd, $env, { 3 => $sock });
-        my ($h, $p) = tcp_host_port($sock);
-        local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
-        Plack::Test::ExternalServer::test_psgi(client => $client);
+        test_httpd($env, $client);
 }
 done_testing;
diff --git a/t/solver_git.t b/t/solver_git.t
index 958af065..e347c711 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -302,29 +302,20 @@ EOF
                                 'UTF-8 commit shown properly');
         };
         test_psgi(sub { $www->call(@_) }, $client);
+        my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };
+        test_httpd($env, $client, 7, sub {
         SKIP: {
-                require_mods(qw(Plack::Test::ExternalServer), 7);
-                my $env = { PI_CONFIG => $cfgpath };
-                my $sock = tcp_server() or die;
-                my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
-                my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
-                my $td = start_script($cmd, $env, { 3 => $sock });
-                my ($h, $p) = tcp_host_port($sock);
-                my $url = "http://$h:$p";
-                local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = $url;
-                Plack::Test::ExternalServer::test_psgi(client => $client);
                 require_cmd('curl', 1) or skip 'no curl', 1;
-
                 mkdir "$tmpdir/ext" // xbail "mkdir $!";
+                my $rurl = "$ENV{PLACK_TEST_EXTERNALSERVER_URI}/$name";
                 test_lei({tmpdir => "$tmpdir/ext"}, sub {
-                        my $rurl = "$url/$name";
                         lei_ok(qw(blob --no-mail 69df7d5 -I), $rurl);
                         is(git_sha(1, \$lei_out)->hexdigest, $expect,
                                 'blob contents output');
                         ok(!lei(qw(blob -I), $rurl, $non_existent),
                                         'non-existent blob fails');
                 });
-        }
+        }});
 }
 
 done_testing();
diff --git a/t/www_altid.t b/t/www_altid.t
index 94a2e807..de1e6ed6 100644
--- a/t/www_altid.t
+++ b/t/www_altid.t
@@ -1,5 +1,5 @@
 #!perl -w
-# Copyright (C) 2020-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; use PublicInbox::TestCommon;
 use PublicInbox::Config;
@@ -59,14 +59,7 @@ my $client = sub {
 };
 test_psgi(sub { $www->call(@_) }, $client);
 SKIP: {
-        require_mods(qw(Plack::Test::ExternalServer), 4);
-        my $env = { PI_CONFIG => $cfgpath };
-        my $sock = tcp_server() or die;
-        my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
-        my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
-        my $td = start_script($cmd, $env, { 3 => $sock });
-        my ($h, $p) = tcp_host_port($sock);
-        local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
-        Plack::Test::ExternalServer::test_psgi(client => $client);
+        my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };
+        test_httpd($env, $client);
 }
 done_testing;
diff --git a/xt/solver.t b/xt/solver.t
index 32cd43cf..c76e0b0a 100644
--- a/xt/solver.t
+++ b/xt/solver.t
@@ -57,20 +57,10 @@ while (($ibx_name, $urls) = each %$todo) {
         }
 }
 
-SKIP: {
-        require_mods(qw(Plack::Test::ExternalServer), $nr);
-        delete @$todo{@gone};
-
-        my $sock = tcp_server() or BAIL_OUT $!;
-        my ($tmpdir, $for_destroy) = tmpdir();
-        my ($out, $err) = map { "$tmpdir/std$_.log" } qw(out err);
-        my $cmd = [ qw(-httpd -W0), "--stdout=$out", "--stderr=$err" ];
-        my $td = start_script($cmd, undef, { 3 => $sock });
-        my ($h, $p) = tcp_host_port($sock);
-        local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
-        while (($ibx_name, $urls) = each %$todo) {
-                Plack::Test::ExternalServer::test_psgi(client => $client);
-        }
+delete @$todo{@gone};
+my $env = { PI_CONFIG => PublicInbox::Config->default_file };
+while (($ibx_name, $urls) = each %$todo) {
+        test_httpd($env, $client, $nr);
 }
 
 done_testing();