tests: favor IPv6

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

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index c13f5e71b18419300594c481720a2381b3d0dbf3..81355f04b1b0694b0bb30b6023bc107cdedbde0b 100644 (file)
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -35,7 +35,7 @@ my $run_httpd = sub {
                my ($out, $err) = map { "$inboxdir/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) = ($sock->sockhost, $sock->sockport);
+               my ($h, $p) = tcp_host_port($sock);
                local $ENV{PLACK_TEST_EXTERNALSERVER_URI} = "http://$h:$p";
                Plack::Test::ExternalServer::test_psgi(client => $client);
                $td->join('TERM');
@@ -87,12 +87,11 @@ like($$msg, qr/\AFrom oldbug/s,
        '"From_" line stored to test old bug workaround');
 
 my $cfgpfx = "publicinbox.v2test";
-my $cfg = <<EOF;
+my $cfg = PublicInbox::Config->new(\<<EOF);
 $cfgpfx.address=$ibx->{-primary_address}
 $cfgpfx.inboxdir=$inboxdir
 EOF
-my $config = PublicInbox::Config->new(\$cfg);
-my $www = PublicInbox::WWW->new($config);
+my $www = PublicInbox::WWW->new($cfg);
 my ($res, $raw, @from_);
 my $client0 = sub {
        my ($cb) = @_;
@@ -154,7 +153,7 @@ my $client1 = sub {
        like($raw, qr/^hello ghosts$/m, 'got third message');
        @from_ = ($raw =~ m/^From /mg);
        is(scalar(@from_), 3, 'three From_ lines');
-       $config->each_inbox(sub { $_[0]->search->reopen });
+       $cfg->each_inbox(sub { $_[0]->search->reopen });
 
        SKIP: {
                eval { require IO::Uncompress::Gunzip };
@@ -244,7 +243,7 @@ $run_httpd->($client1, 38);
        $im->done;
        my @h = $mime->header('Message-ID');
        is_deeply($exp, \@h, 'reused existing Message-ID');
-       $config->each_inbox(sub { $_[0]->search->reopen });
+       $cfg->each_inbox(sub { $_[0]->search->reopen });
 }
 
 my $client2 = sub {
@@ -283,7 +282,7 @@ $run_httpd->($client2, 8);
                ok($im->add($mime), "added attachment $body");
        }
        $im->done;
-       $config->each_inbox(sub { $_[0]->search->reopen });
+       $cfg->each_inbox(sub { $_[0]->search->reopen });
 }
 
 my $client3 = sub {