X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fextsearch.t;h=dfc190e2d69e8a3d2628361a62db45d1102c86f2;hb=e6b5ef6a248f5808fff0483f02bd73dcbfea8c0a;hp=6c074022aa134fa4116863655c02413eaf9ee931;hpb=63d7b8ceee55a34cde983e8548d5ce61050d2891;p=public-inbox.git

diff --git a/t/extsearch.t b/t/extsearch.t
index 6c074022..dfc190e2 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -176,7 +176,7 @@ if ('inbox edited') {
 	is($mset->size, 1, 'new message found');
 	$mset = $es->mset('b:"test message"');
 	is($mset->size, 1, 'old message found');
-	delete @$es{qw(git over xdb)}; # fork preparation
+	delete @$es{qw(git over xdb qp)}; # fork preparation
 
 	my $pi_cfg = PublicInbox::Config->new;
 	$pi_cfg->fill_all;
@@ -336,6 +336,11 @@ if ('reindex catches missed messages') {
 	$es->{xdb}->reopen;
 	$mset = $es->mset("mid:$new->{mid}");
 	is($mset->size, 0, 'stale mid gone Xapian');
+
+	ok(run_script([qw(-extindex --reindex --all --fast), "$home/extindex"],
+			undef, $opt), '--reindex w/ --fast');
+	ok(!run_script([qw(-extindex --all --fast), "$home/extindex"],
+			undef, $opt), '--fast alone makes no sense');
 }
 
 if ('reindex catches content bifurcation') {
@@ -370,7 +375,7 @@ if ('reindex catches content bifurcation') {
 	is($oidx->max, $oldmax, 'oidx->max unchanged');
 	$oidx->dbh_close;
 	ok(run_script([qw(-extindex --reindex --all), "$home/extindex"],
-		undef, $opt), 'extindex --reindex');
+		undef, $opt), 'extindex --reindex') or diag explain($opt);
 	$oidx->dbh;
 	ok($oidx->max > $oldmax, 'oidx->max bumped');
 	like($err, qr/split into 2 due to deduplication change/,
@@ -423,6 +428,7 @@ if ('dedupe + dry-run') {
 		'--dry-run alone fails');
 }
 
+# chmod 0755, $home or xbail "chmod: $!";
 for my $j (1, 3, 6) {
 	my $o = { 2 => \(my $err = '') };
 	my $d = "$home/extindex-j$j";
@@ -441,21 +447,21 @@ SKIP: {
 	ok(ref($es->{xdb}), '{xdb} created');
 	my $nshards1 = $es->{nshard};
 	is($nshards1, 1, 'correct shard count');
-	my $xdb_str = "$es->{xdb}";
-	ok($es->cleanup_shards, 'cleanup_shards noop');
-	is("$es->{xdb}", $xdb_str, '{xdb} unchanged');
 
+	my @ei_dir = glob("$d/ei*/");
+	chmod 0755, $ei_dir[0] or xbail "chmod: $!";
+	my $mode = sprintf('%04o', 07777 & (stat($ei_dir[0]))[2]);
+	is($mode, '0755', 'mode set on ei*/ dir');
 	my $o = { 2 => \(my $err = '') };
 	ok(run_script([qw(-xcpdb -R4), $d]), 'xcpdb R4');
 	my @dirs = glob("$d/ei*/?");
 	for my $i (0..3) {
 		is(grep(m!/ei[0-9]+/$i\z!, @dirs), 1, "shard [$i] created");
+		my $m = sprintf('%04o', 07777 & (stat($dirs[$i]))[2]);
+		is($m, $mode, "shard [$i] mode");
 	}
-	is($es->cleanup_shards, undef, 'cleanup_shards cleaned');
-	ok(!defined($es->{xdb}), 'old {xdb} gone');
-	is($es->cleanup_shards, undef, 'cleanup_shards clean idempotent');
+	delete @$es{qw(xdb qp)};
 	is($es->mset('z:0..')->size, $nresult0, 'new shards, same results');
-	ok($es->cleanup_shards, 'cleanup_shards true after open');
 
 	for my $i (4..5) {
 		is(grep(m!/ei[0-9]+/$i\z!, @dirs), 0, "no shard [$i]");