X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Finit.t;h=0cd6f31fe073c2057bb9df6e03ceb3a6aead9a63;hb=1bbfab375438f149dcff9047dd0c5ed3a08eed53;hp=1551a304e6b7c7b28bb3b9e8b935f9a231f745cb;hpb=0e933ed9b8a751d70623f72fbee98ad77af7578c;p=public-inbox.git

diff --git a/t/init.t b/t/init.t
index 1551a304..0cd6f31f 100644
--- a/t/init.t
+++ b/t/init.t
@@ -1,14 +1,17 @@
-# 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;
 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",
@@ -84,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();