X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Finit.t;h=59f54813f6ae5a035aea6de3778bb81d6e5d1b8c;hb=e350de7fdbe12dafc36e893e66ce8c93ec6dc3f2;hp=b78fbaf5e5a78d15b946a03290c10327aed6f731;hpb=5cddfa50765d59157e15488c235fe01202db0972;p=public-inbox.git

diff --git a/t/init.t b/t/init.t
index b78fbaf5..59f54813 100644
--- a/t/init.t
+++ b/t/init.t
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 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;
@@ -7,16 +7,67 @@ use PublicInbox::Config;
 use File::Temp qw/tempdir/;
 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;
+open my $null, '>>', '/dev/null';
+my $rdr = { 2 => fileno($null) };
+sub quiet_fail {
+	my ($cmd, $msg) = @_;
+	# run_die doesn't take absolute paths:
+	my $path = $ENV{PATH};
+	if (index($cmd->[0], '/') >= 0) {
+		my ($dir, $base) = ($cmd->[0] =~ m!\A(.+)/([^/]+)\z!);
+		$path = "$dir:$path";
+		$cmd->[0] = $base;
+	}
+	local $ENV{PATH} = $path;
+	eval { PublicInbox::Import::run_die($cmd, undef, $rdr) };
+	isnt($@, '', $msg);
+}
 
 {
 	local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
 	my $cfgfile = "$ENV{PI_DIR}/config";
 	my @cmd = (pi_init, 'blist', "$tmpdir/blist",
 		   qw(http://example.com/blist blist@example.com));
-	is(system(@cmd), 0, 'public-inbox-init failed');
+	is(system(@cmd), 0, 'public-inbox-init OK');
 
 	ok(-e $cfgfile, "config exists, now");
-	is(system(@cmd), 0, 'public-inbox-init failed (idempotent)');
+	is(system(@cmd), 0, 'public-inbox-init OK (idempotent)');
+
+	chmod 0666, $cfgfile or die "chmod failed: $!";
+	@cmd = (pi_init, 'clist', "$tmpdir/clist",
+		   qw(http://example.com/clist clist@example.com));
+	is(system(@cmd), 0, 'public-inbox-init clist OK');
+	is((stat($cfgfile))[2] & 07777, 0666, "permissions preserved");
+
+	@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');
+}
+
+SKIP: {
+	foreach my $mod (qw(DBD::SQLite Search::Xapian::WritableDatabase)) {
+		eval "require $mod";
+		skip "$mod missing for v2", 2 if $@;
+	}
+	local $ENV{PI_DIR} = "$tmpdir/.public-inbox/";
+	my $cfgfile = "$ENV{PI_DIR}/config";
+	my @cmd = (pi_init, '-V2', 'v2list', "$tmpdir/v2list",
+		   qw(http://example.com/v2list v2list@example.com));
+	is(system(@cmd), 0, 'public-inbox-init -V2 OK');
+	ok(-d "$tmpdir/v2list", 'v2list directory exists');
+	ok(-f "$tmpdir/v2list/msgmap.sqlite3", 'msgmap exists');
+	ok(-d "$tmpdir/v2list/all.git", 'catch-all.git directory exists');
+	@cmd = (pi_init, 'v2list', "$tmpdir/v2list",
+		   qw(http://example.com/v2list v2list@example.com));
+	is(system(@cmd), 0, 'public-inbox-init is idempotent');
+	ok(! -d "$tmpdir/public-inbox" && !-d "$tmpdir/objects",
+		'idempotent invocation w/o -V2 does not make inbox v1');
+
+	@cmd = (pi_init, 'v2list', "-V1", "$tmpdir/v2list",
+		   qw(http://example.com/v2list v2list@example.com));
+	quiet_fail(\@cmd, 'initializing V2 as V1 fails');
 }
 
 done_testing();