config: simplify lookup* methods

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

diff --git a/t/v2mirror.t b/t/v2mirror.t
index ef9a5405a0dff95cb631731a26280e9addc73f5b..86ca895d34aaa130cf05ebfc0973854d82e3e4b7 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -7,7 +7,7 @@ require './t/common.perl';
 require_git(2.6);
 
 # Integration tests for HTTP cloning + mirroring
-foreach my $mod (qw(Plack::Util Plack::Builder Danga::Socket
+foreach my $mod (qw(Plack::Util Plack::Builder
                        HTTP::Date HTTP::Status Search::Xapian DBD::SQLite
                        IPC::Run)) {
        eval "require $mod";
@@ -17,6 +17,7 @@ use File::Temp qw/tempdir/;
 use IO::Socket;
 use POSIX qw(dup2);
 use_ok 'PublicInbox::V2Writable';
+use PublicInbox::InboxWritable;
 use PublicInbox::MIME;
 use PublicInbox::Config;
 # FIXME: too much setup
@@ -59,17 +60,11 @@ my $epoch_max = $v2w->{epoch_max};
 ok($epoch_max > 0, "multiple epochs");
 $v2w->done;
 
-my %opts = (
-       LocalAddr => '127.0.0.1',
-       ReuseAddr => 1,
-       Proto => 'tcp',
-       Listen => 1024,
-);
 my ($sock, $pid);
 END { kill 'TERM', $pid if defined $pid };
 
 $! = 0;
-$sock = IO::Socket::INET->new(%opts);
+$sock = tcp_server();
 ok($sock, 'sock created');
 my $cmd = [ "$script-httpd", "--stdout=$tmpdir/out", "--stderr=$tmpdir/err" ];
 ok(defined($pid = spawn_listener(undef, $cmd, [ $sock ])),
@@ -79,11 +74,13 @@ $sock = undef;
 
 my @cmd;
 foreach my $i (0..$epoch_max) {
-       @cmd = (qw(git clone --mirror -q), "http://$host:$port/v2/$i",
+       my $sfx = $i == 0 ? '.git' : '';
+       @cmd = (qw(git clone --mirror -q),
+               "http://$host:$port/v2/$i$sfx",
                "$tmpdir/m/git/$i.git");
 
-       is(system(@cmd), 0, 'cloned OK');
-       ok(-d "$tmpdir/m/git/$i.git", 'mirror OK');
+       is(system(@cmd), 0, "cloned $i.git");
+       ok(-d "$tmpdir/m/git/$i.git", "mirror $i OK");
 }
 
 @cmd = ("$script-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m',