X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Findexlevels-mirror.t;h=2244870ba3166fa372d0aa6adc2426fa09a52cae;hb=a65ebdc3a1f064bab0cddf64b34caad49f1c4c9c;hp=b685da145fefcbe49bfd490186364a2ded5832d1;hpb=c477bdd8a80eecc319b680764edfb24bd12cb7b2;p=public-inbox.git

diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t
index b685da14..2244870b 100644
--- a/t/indexlevels-mirror.t
+++ b/t/indexlevels-mirror.t
@@ -6,20 +6,11 @@ use Test::More;
 use PublicInbox::MIME;
 use PublicInbox::Inbox;
 use PublicInbox::InboxWritable;
-use File::Temp qw/tempdir/;
 require PublicInbox::Admin;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 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 $0" if $@;
-}
-
-my $path = 'blib/script';
-my $index = "$path/public-inbox-index";
-my @xcpdb = ("$path/public-inbox-xcpdb", '-q');
+require_mods(qw(DBD::SQLite));
 
 my $mime = PublicInbox::MIME->create(
 	header => [
@@ -32,11 +23,12 @@ my $mime = PublicInbox::MIME->create(
 );
 
 sub import_index_incremental {
-	my ($v, $level) = @_;
+	my ($v, $level, $mime) = @_;
 	my $this = "pi-$v-$level-indexlevels";
-	my $tmpdir = tempdir("$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1);
+	my ($tmpdir, $for_destroy) = tmpdir();
+	local $ENV{PI_CONFIG} = "$tmpdir/config";
 	my $ibx = PublicInbox::Inbox->new({
-		mainrepo => "$tmpdir/testbox",
+		inboxdir => "$tmpdir/testbox",
 		name => $this,
 		version => $v,
 		-primary_address => 'test@example.com',
@@ -48,9 +40,10 @@ sub import_index_incremental {
 	$im->done;
 
 	# index master (required for v1)
-	is(system($index, $ibx->{mainrepo}, "-L$level"), 0, 'index master OK');
+	ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]),
+		'index master OK');
 	my $ro_master = PublicInbox::Inbox->new({
-		mainrepo => $ibx->{mainrepo},
+		inboxdir => $ibx->{inboxdir},
 		indexlevel => $level
 	});
 	my ($nr, $msgs) = $ro_master->recent;
@@ -61,26 +54,26 @@ 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");
 
 	# inbox init
 	local $ENV{PI_CONFIG} = "$tmpdir/.picfg";
-	@cmd = ("$path/public-inbox-init", '-L', $level,
+	@cmd = ('-init', '-L', $level,
 		'mirror', $mirror, '//example.com/test', 'test@example.com');
 	push @cmd, '-V2' if $v == 2;
-	is(system(@cmd), 0, "v$v init OK");
+	ok(run_script(\@cmd), "v$v init OK");
 
 	# index mirror
-	is(system($index, $mirror), 0, "v$v index mirror OK");
+	ok(run_script(['-index', $mirror]), "v$v index mirror OK");
 
 	# read-only access
 	my $ro_mirror = PublicInbox::Inbox->new({
-		mainrepo => $mirror,
+		inboxdir => $mirror,
 		indexlevel => $level,
 	});
 	($nr, $msgs) = $ro_mirror->recent;
@@ -94,14 +87,15 @@ sub import_index_incremental {
 
 	# mirror updates
 	is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
-	is(system($index, $mirror), 0, "v$v index mirror again OK");
+	ok(run_script(['-index', $mirror]), "v$v index mirror again OK");
 	($nr, $msgs) = $ro_mirror->recent;
 	is($nr, 2, '2nd message seen in mirror');
 	is_deeply([sort { $a cmp $b } map { $_->{mid} } @$msgs],
 		['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');
+	ok(run_script(['-index', $ibx->{inboxdir}, "-L$level"]),
+		'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],
@@ -120,7 +114,7 @@ sub import_index_incremental {
 	is_deeply(\@rw_nums, [1], 'unindex NNTP article'.$v.$level);
 
 	if ($level ne 'basic') {
-		is(system(@xcpdb, $mirror), 0, "v$v xcpdb OK");
+		ok(run_script(['-xcpdb', '-q', $mirror]), "v$v xcpdb OK");
 		is(PublicInbox::Admin::detect_indexlevel($ro_mirror), $level,
 		   'indexlevel detectable by Admin after xcpdb v' .$v.$level);
 		delete $ro_mirror->{$_} for (qw(over search));
@@ -130,14 +124,14 @@ sub import_index_incremental {
 
 	# sync the mirror
 	is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
-	is(system($index, $mirror), 0, "v$v index mirror again OK");
+	ok(run_script(['-index', $mirror]), "v$v index mirror again OK");
 	($nr, $msgs) = $ro_mirror->recent;
 	is($nr, 1, '2nd message gone from mirror');
 	is_deeply([map { $_->{mid} } @$msgs], ['m@1'],
 		'message unavailable in mirror');
 
 	if ($v == 2 && $level eq 'basic') {
-		is_deeply([glob("$ibx->{mainrepo}/xap*/?/")], [],
+		is_deeply([glob("$ibx->{inboxdir}/xap*/?/")], [],
 			 'no Xapian shard directories for v2 basic');
 	}
 	if ($level ne 'basic') {
@@ -155,7 +149,7 @@ sub import_index_incremental {
 	}
 	$im->done;
 	is(system('git', "--git-dir=$fetch_dir", qw(fetch -q)), 0, 'fetch OK');
-	is(system($index, '--reindex', $mirror), 0,
+	ok(run_script(['-index', '--reindex', $mirror]),
 		"v$v index --reindex mirror OK");
 	@ro_nums = map { $_->{num} } @{$ro_mirror->over->query_ts(0, 0)};
 	@rw_nums = map { $_->{num} } @{$ibx->over->query_ts(0, 0)};
@@ -167,13 +161,14 @@ sub import_index_incremental {
 }
 
 # we can probably cull some other tests
-import_index_incremental($PI_TEST_VERSION, 'basic');
+import_index_incremental($PI_TEST_VERSION, 'basic', $mime);
 
 SKIP: {
 	require PublicInbox::Search;
-	PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 2;
+	PublicInbox::Search::load_xapian() or
+		skip('Xapian perl binding missing', 2);
 	foreach my $l (qw(medium full)) {
-		import_index_incremental($PI_TEST_VERSION, $l);
+		import_index_incremental($PI_TEST_VERSION, $l, $mime);
 	}
 }