X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=40afe4e9e7f9234111f1d34247f5fc349c0d6215;hb=1bbfab375438f149dcff9047dd0c5ed3a08eed53;hp=bf0f801822adf4970dae3e1bccdc0f9794b8e254;hpb=3c9ab47c7d0e26fd22e1f42a198696b093629802;p=public-inbox.git

diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index bf0f8018..40afe4e9 100644
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -9,12 +9,12 @@ use PublicInbox::InboxWritable;
 use File::Temp qw/tempdir/;
 require PublicInbox::Admin;
 require './t/common.perl';
-require_git(2.6);
-my $this = (split('/', __FILE__))[-1];
+my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2;
+require_git('2.6') if $PI_TEST_VERSION == 2;
 
 foreach my $mod (qw(DBD::SQLite)) {
 	eval "require $mod";
-	plan skip_all => "$mod missing for $this" if $@;
+	plan skip_all => "$mod missing for $0" if $@;
 }
 
 my $path = 'blib/script';
@@ -33,10 +33,11 @@ my $mime = PublicInbox::MIME->create(
 
 sub import_index_incremental {
 	my ($v, $level) = @_;
-	my $tmpdir = tempdir("pi-$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1);
+	my $this = "pi-$v-$level-indexlevels";
+	my $tmpdir = tempdir("$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1);
 	my $ibx = PublicInbox::Inbox->new({
-		mainrepo => "$tmpdir/testbox",
-		name => "$this-$v",
+		inboxdir => "$tmpdir/testbox",
+		name => $this,
 		version => $v,
 		-primary_address => 'test@example.com',
 		indexlevel => $level,
@@ -47,9 +48,9 @@ sub import_index_incremental {
 	$im->done;
 
 	# index master (required for v1)
-	is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
+	is(system($index, $ibx->{inboxdir}, "-L$level"), 0, 'index master OK');
 	my $ro_master = PublicInbox::Inbox->new({
-		mainrepo => $ibx->{mainrepo},
+		inboxdir => $ibx->{inboxdir},
 		indexlevel => $level
 	});
 	my ($nr, $msgs) = $ro_master->recent;
@@ -60,9 +61,9 @@ sub import_index_incremental {
 	my @cmd = (qw(git clone --mirror -q));
 	my $mirror = "$tmpdir/mirror-$v";
 	if ($v == 1) {
-		push @cmd, $ibx->{mainrepo}, $mirror;
+		push @cmd, $ibx->{inboxdir}, $mirror;
 	} else {
-		push @cmd, "$ibx->{mainrepo}/git/0.git", "$mirror/git/0.git";
+		push @cmd, "$ibx->{inboxdir}/git/0.git", "$mirror/git/0.git";
 	}
 	my $fetch_dir = $cmd[-1];
 	is(system(@cmd), 0, "v$v clone OK");
@@ -79,7 +80,7 @@ sub import_index_incremental {
 
 	# read-only access
 	my $ro_mirror = PublicInbox::Inbox->new({
-		mainrepo => $mirror,
+		inboxdir => $mirror,
 		indexlevel => $level,
 	});
 	($nr, $msgs) = $ro_mirror->recent;
@@ -100,7 +101,7 @@ sub import_index_incremental {
 		['m@1','m@2'], 'got both messages in mirror');
 
 	# incremental index master (required for v1)
-	is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
+	is(system($index, $ibx->{inboxdir}, "-L$level"), 0, 'index master OK');
 	($nr, $msgs) = $ro_master->recent;
 	is($nr, 2, '2nd message seen in master');
 	is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
@@ -136,8 +137,8 @@ sub import_index_incremental {
 		'message unavailable in mirror');
 
 	if ($v == 2 && $level eq 'basic') {
-		is_deeply([glob("$ibx->{mainrepo}/xap*/?/")], [],
-			 'no Xapian partition directories for v2 basic');
+		is_deeply([glob("$ibx->{inboxdir}/xap*/?/")], [],
+			 'no Xapian shard directories for v2 basic');
 	}
 	if ($level ne 'basic') {
 		($nr, $msgs) = $ro_mirror->search->reopen->query('m:m@2');
@@ -165,24 +166,14 @@ sub import_index_incremental {
 	   'indexlevel detectable by Admin '.$v.$level);
 }
 
-# we can probably cull some other tests and put full/medium tests, here
-for my $level (qw(basic)) {
-	for my $v (1..2) {
-		subtest("v$v indexlevel=$level" => sub {
-			import_index_incremental($v, $level);
-		})
-	}
-}
+# we can probably cull some other tests
+import_index_incremental($PI_TEST_VERSION, 'basic');
 
 SKIP: {
 	require PublicInbox::Search;
 	PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2;
-	for my $v (1..2) {
-		foreach my $l (qw(medium full)) {
-			subtest("v$v indexlevel=$l" => sub {
-				import_index_incremental($v, $l);
-			});
-		}
+	foreach my $l (qw(medium full)) {
+		import_index_incremental($PI_TEST_VERSION, $l);
 	}
 }