X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Finit.t;h=0cd6f31fe073c2057bb9df6e03ceb3a6aead9a63;hb=4821798351defce82c102e46d6f5f84f0cdc0e34;hp=182d065cb66461e9037c4fdb832834fb153e2456;hpb=4f95d67d882eec0f058dd62ee83e8b9c973f4a26;p=public-inbox.git
diff --git a/t/init.t b/t/init.t
index 182d065c..0cd6f31f 100644
--- a/t/init.t
+++ b/t/init.t
@@ -1,14 +1,17 @@
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2019 all contributors
# License: AGPL-3.0+
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;
use File::Basename;
+use PublicInbox::Spawn qw(spawn);
+use Cwd qw(getcwd);
open my $null, '>>', '/dev/null';
my $rdr = { 2 => fileno($null) };
sub quiet_fail {
@@ -46,6 +49,16 @@ sub quiet_fail {
@cmd = (pi_init, 'clist', '-V2', "$tmpdir/clist",
qw(http://example.com/clist clist@example.com));
quiet_fail(\@cmd, 'attempting to init V2 from V1 fails');
+
+ open my $lock, '+>', "$cfgfile.lock" or die;
+ @cmd = (getcwd(). '/'. pi_init, 'lock', "$tmpdir/lock",
+ qw(http://example.com/lock lock@example.com));
+ ok(-e "$cfgfile.lock", 'lock exists');
+ my $pid = spawn(\@cmd, undef, $rdr);
+ is(waitpid($pid, 0), $pid, 'lock init failed');
+ is($? >> 8, 255, 'got expected exit code on lock failure');
+ ok(unlink("$cfgfile.lock"),
+ '-init did not unlink lock on failure');
}
SKIP: {
@@ -53,6 +66,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",
@@ -79,6 +93,22 @@ SKIP: {
is(system(@cmd), 0, "-init -L $lvl");
is(read_indexlevel("v2$lvl"), $lvl, "indexlevel set to '$lvl'");
}
+
+ # loop for idempotency
+ for (1..2) {
+ @cmd = (pi_init, '-V2', '-S1', 'skip1', "$tmpdir/skip1",
+ qw(http://example.com/skip1 skip1@example.com));
+ is(system(@cmd), 0, "--skip-epoch 1");
+ my $gits = [ glob("$tmpdir/skip1/git/*.git") ];
+ is_deeply($gits, ["$tmpdir/skip1/git/1.git"], 'skip OK');
+ }
+
+
+ @cmd = (pi_init, '-V2', '--skip-epoch=2', 'skip2', "$tmpdir/skip2",
+ qw(http://example.com/skip2 skip2@example.com));
+ is(system(@cmd), 0, "--skip-epoch 2");
+ my $gits = [ glob("$tmpdir/skip2/git/*.git") ];
+ is_deeply($gits, ["$tmpdir/skip2/git/2.git"], 'skipping 2 works, too');
}
done_testing();