init: favor --skip-epoch instead of --skip

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

diff --git a/t/init.t b/t/init.t
index 1551a304e6b7c7b28bb3b9e8b935f9a231f745cb..667b09fee902caaa8098afee342627a19ca1704d 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -1,10 +1,11 @@
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 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 PublicInbox::Config;
 use File::Temp qw/tempdir/;
+require './t/common.perl';
 my $tmpdir = tempdir('pi-init-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 use constant pi_init => 'blib/script/public-inbox-init';
 use PublicInbox::Import;
@@ -53,6 +54,7 @@ SKIP: {
                eval "require $mod";
                skip "$mod missing for v2", 2 if $@;
        }
+       require_git(2.6, 1) or skip "git 2.6+ required", 2;
        local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
        my $cfgfile = "$ENV{PI_DIR}/config";
        my @cmd = (pi_init, '-V2', 'v2list', "$tmpdir/v2list",
@@ -84,17 +86,17 @@ SKIP: {
        for (1..2) {
                @cmd = (pi_init, '-V2', '-S1', 'skip1', "$tmpdir/skip1",
                           qw(http://example.com/skip1 skip1@example.com));
-               is(system(@cmd), 0, "--skip 1");
+               is(system(@cmd), 0, "--skip-epoch 1");
                my $gits = [ glob("$tmpdir/skip1/git/*.git") ];
-               is_deeply(["$tmpdir/skip1/git/1.git"], $gits, 'skip OK');
+               is_deeply($gits, ["$tmpdir/skip1/git/1.git"], 'skip OK');
        }
 
 
-       @cmd = (pi_init, '-V2', '--skip=2', 'skip2', "$tmpdir/skip2",
+       @cmd = (pi_init, '-V2', '--skip-epoch=2', 'skip2', "$tmpdir/skip2",
                   qw(http://example.com/skip2 skip2@example.com));
-       is(system(@cmd), 0, "--skip 2");
+       is(system(@cmd), 0, "--skip-epoch 2");
        my $gits = [ glob("$tmpdir/skip2/git/*.git") ];
-       is_deeply(["$tmpdir/skip2/git/2.git"], $gits, 'skipping 2 works, too');
+       is_deeply($gits, ["$tmpdir/skip2/git/2.git"], 'skipping 2 works, too');
 }
 
 done_testing();