init: implement locking

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

diff --git a/t/init.t b/t/init.t
index 86b4eb5c72e67b74a3474b1aee2030e3d3b71cec..0cd6f31fe073c2057bb9df6e03ceb3a6aead9a63 100644 (file)
--- a/t/init.t
+++ b/t/init.t
@@ -1,4 +1,4 @@
-# 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;
@@ -10,6 +10,8 @@ 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 {
@@ -47,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: {
@@ -86,17 +98,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();