From e95fbe90accedf079f3ddbd1df8e267e2fe90c2e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 4 Oct 2022 19:12:31 +0000 Subject: tests: use test_httpd consistently This allows us to consolidate our checks for Plack::Test::ExternalServer and enforce our redirect-disabled LWP::UserAgent. --- xt/solver.t | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'xt') 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(); -- cgit v1.2.3-24-ge0c7