tests: use test_httpd consistently

[public-inbox.git] / xt / solver.t

diff --git a/xt/solver.t b/xt/solver.t
index 2f2fcc4463ce2fec5fc2f1f67ffb519a94b0ebdf..c76e0b0a5fc12e88b61fef813c2ac45851d72016 100644 (file)
--- a/xt/solver.t
+++ b/xt/solver.t
@@ -1,8 +1,7 @@
 #!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 Test::More;
+use v5.12;
 use PublicInbox::TestCommon;
 use PublicInbox::Config; # this relies on PI_CONFIG // ~/.public-inbox/config
 my @psgi = qw(HTTP::Request::Common Plack::Test URI::Escape Plack::Builder);
@@ -41,8 +40,8 @@ my $client = sub {
                my $res = $cb->(GET($url));
                is($res->code, 200, $url);
                next if $res->code == 200;
-               # diag $res->content;
                diag "$url failed";
+               diag $res->content;
        }
 };
 
@@ -58,21 +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) = ($sock->sockhost, $sock->sockport);
-
-       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();