X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2mirror.t;h=406bbd4fc5f22f216031460678fc1062d9d6b5ec;hb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;hp=e3c384fa77a1f546741e153a59492d2d96b49c20;hpb=3c313f9034aac96182e2efdc2f92c40803626f32;p=public-inbox.git diff --git a/t/v2mirror.t b/t/v2mirror.t index e3c384fa..406bbd4f 100644 --- a/t/v2mirror.t +++ b/t/v2mirror.t @@ -1,4 +1,4 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; @@ -9,11 +9,8 @@ require_git(2.6); local $ENV{HOME} = abs_path('t'); # Integration tests for HTTP cloning + mirroring -foreach my $mod (qw(Plack::Util Plack::Builder - HTTP::Date HTTP::Status Search::Xapian DBD::SQLite)) { - eval "require $mod"; - plan skip_all => "$mod missing for v2mirror.t" if $@; -} +require_mods(qw(Plack::Util Plack::Builder + HTTP::Date HTTP::Status Search::Xapian DBD::SQLite)); use IO::Socket; use POSIX qw(dup2); use_ok 'PublicInbox::V2Writable'; @@ -58,6 +55,11 @@ for my $i (1..9) { my $epoch_max = $v2w->{epoch_max}; ok($epoch_max > 0, "multiple epochs"); $v2w->done; +{ + my $smsg = $ibx->over->get_art(1); + like($smsg->{lines}, qr/\A[0-9]+\z/, 'lines is a digit'); + like($smsg->{bytes}, qr/\A[0-9]+\z/, 'bytes is a digit'); +} $ibx->cleanup; my $sock = tcp_server(); @@ -74,7 +76,7 @@ foreach my $i (0..$epoch_max) { "http://$host:$port/v2/$i$sfx", "$tmpdir/m/git/$i.git"); - is(system(@cmd), 0, "cloned $i.git"); + is(xsys(@cmd), 0, "cloned $i.git"); ok(-d "$tmpdir/m/git/$i.git", "mirror $i OK"); } @@ -100,7 +102,7 @@ $ibx->cleanup; my $fetch_each_epoch = sub { foreach my $i (0..$epoch_max) { my $dir = "$tmpdir/m/git/$i.git"; - is(system('git', "--git-dir=$dir", 'fetch', '-q'), 0, + is(xsys('git', "--git-dir=$dir", 'fetch', '-q'), 0, 'fetch successful'); } };