multi_git: hoist out common epoch/alternates handling

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

diff --git a/t/v2mirror.t b/t/v2mirror.t
index b0075fcc88702b14c954bb606252a6bcd186a7f9..54ad6945f86be00107eb207050dc9d235279ab94 100644 (file)
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -1,19 +1,17 @@
 # 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;
-use Test::More;
+use v5.10.1;
 use PublicInbox::TestCommon;
 use File::Path qw(remove_tree);
 use Cwd qw(abs_path);
 require_git(2.6);
+require_cmd('curl');
 local $ENV{HOME} = abs_path('t');
 
 # Integration tests for HTTP cloning + mirroring
 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';
 use PublicInbox::InboxWritable;
 use PublicInbox::Eml;
@@ -99,10 +97,6 @@ $ibx->cleanup;
 
 my @new_epochs;
 my $fetch_each_epoch = sub {
-       my $mf = "$tmpdir/m/manifest.js.gz";
-       if (my @st = stat($mf)) {
-               utime($st[8], $st[9] - 1, $mf) or xbail "utime $mf: $!";
-       }
        my %before = map { $_ => 1 } glob("$tmpdir/m/git/*");
        run_script([qw(-fetch -q)], undef, {-C => "$tmpdir/m"}) or
                xbail '-fetch fail';
@@ -234,10 +228,13 @@ EOF
        is(scalar($mset->items), 0, 'large message not re-indexed');
 }
 ok(scalar(@new_epochs), 'new epochs were created and fetched');
+for my $d (@new_epochs) {
+       is(xqx(['git', "--git-dir=$d", 'config', qw(include.path)]),
+               "../../all.git/config\n",
+               'include.path set');
+}
 
 ok($td->kill, 'killed httpd');
 $td->join;
 
-done_testing();
-
-1;
+done_testing;