config: support "inboxdir" in addition to "mainrepo"

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

diff --git a/t/www_listing.t b/t/www_listing.t
index d82a4a4a581345425d06a03bdfbc786a8c44c2c5..9f71257d1361facc58f8f21cf598783767abfc71 100644 (file)
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -55,7 +55,12 @@ sub tiny_test {
                $res->{headers}->{'last-modified'},
                'modified field and Last-Modified header match');
 
-       ok($manifest->{'/v2/git/0.git'}, 'v2 epoch appeared');
+       ok(my $v2epoch0 = $manifest->{'/v2/git/0.git'}, 'v2 epoch 0 appeared');
+       like($v2epoch0->{description}, qr/ \[epoch 0\]\z/,
+               'epoch 0 in description');
+       ok(my $v2epoch1 = $manifest->{'/v2/git/1.git'}, 'v2 epoch 1 appeared');
+       like($v2epoch1->{description}, qr/ \[epoch 1\]\z/,
+               'epoch 1 in description');
 }
 
 my $pid;
@@ -67,15 +72,7 @@ SKIP: {
        my $cfgfile = "$tmpdir/config";
        my $v2 = "$tmpdir/v2";
        my $httpd = 'blib/script/public-inbox-httpd';
-       use IO::Socket::INET;
-       my %opts = (
-               LocalAddr => '127.0.0.1',
-               ReuseAddr => 1,
-               Proto => 'tcp',
-               Type => SOCK_STREAM,
-               Listen => 1024,
-       );
-       my $sock = IO::Socket::INET->new(%opts);
+       my $sock = tcp_server();
        ok($sock, 'sock created');
        my ($host, $port) = ($sock->sockhost, $sock->sockport);
        my @clone = qw(git clone -q -s --bare);
@@ -94,15 +91,15 @@ SKIP: {
        open $fh, '>', $cfgfile or die;
        print $fh <<"" or die;
 [publicinbox "bare"]
-       mainrepo = $bare->{git_dir}
+       inboxdir = $bare->{git_dir}
        url = http://$host/bare
        address = bare\@example.com
 [publicinbox "alt"]
-       mainrepo = $alt
+       inboxdir = $alt
        url = http://$host/alt
        address = alt\@example.com
 [publicinbox "v2"]
-       mainrepo = $v2
+       inboxdir = $v2
        url = http://$host/v2
        address = v2\@example.com