X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-mirror.t;h=32a5b03907147354f11bdd49d05a498f6f2bbd08;hb=refs%2Fheads%2Fmaster;hp=b449e0b48a41eb8358c25bb047327c88acd177aa;hpb=97510d7a92b4e44318d1917a54c70d536bbf46f2;p=public-inbox.git

diff --git a/t/lei-mirror.t b/t/lei-mirror.t
index b449e0b4..c172483b 100644
--- a/t/lei-mirror.t
+++ b/t/lei-mirror.t
@@ -22,7 +22,7 @@ test_lei({ tmpdir => $tmpdir }, sub {
 	lei_ok('add-external', $t1, '--mirror', "$http/t1/", \'--mirror v1');
 	my $mm_dup = "$t1/public-inbox/msgmap.sqlite3";
 	ok(-f $mm_dup, 't1-mirror indexed');
-	is(PublicInbox::Inbox::try_cat("$t1/description"),
+	is(PublicInbox::Git::try_cat("$t1/description"),
 		"mirror of $http/t1/\n", 'description set');
 	ok(-f "$t1/Makefile", 'convenience Makefile added (v1)');
 	ok(-f "$t1/inbox.config.example", 'inbox.config.example downloaded');
@@ -43,7 +43,7 @@ test_lei({ tmpdir => $tmpdir }, sub {
 	ok(-f $mm_dup, 't2-mirror indexed');
 	ok(-f "$t2/description", 't2 description');
 	ok(-f "$t2/Makefile", 'convenience Makefile added (v2)');
-	is(PublicInbox::Inbox::try_cat("$t2/description"),
+	is(PublicInbox::Git::try_cat("$t2/description"),
 		"mirror of $http/t2/\n", 'description set');
 	$tb = PublicInbox::Msgmap->new_file($mm_dup)->created_at;
 	is($tb, $created{v2}, 'created_at matched in v2 mirror');
@@ -167,14 +167,27 @@ SKIP: {
 	my $after = [ glob("$d/t1/*") ];
 	is_deeply($before, $after, 'no new files created');
 
+	local $ENV{HOME} = $tmpdir;
 	ok(run_script([qw(-index -Lbasic), "$d/t1"]), 'index v1');
 	ok(run_script([qw(-index -Lbasic), "$d/t2"]), 'index v2');
-	my $f = "$d/t1/public-inbox/msgmap.sqlite3";
-	my $ca = PublicInbox::Msgmap->new_file($f)->created_at;
-	is($ca, $created{v1}, 'clone + index v1 synced ->created_at');
-	$f = "$d/t2/msgmap.sqlite3";
-	$ca = PublicInbox::Msgmap->new_file($f)->created_at;
-	is($ca, $created{v2}, 'clone + index v1 synced ->created_at');
+
+	SKIP: {
+		join('', sort(keys %created)) eq 'v1v2' or
+			skip "lei didn't run", 2;
+		my $f = "$d/t1/public-inbox/msgmap.sqlite3";
+		my $ca = PublicInbox::Msgmap->new_file($f)->created_at;
+		is($ca, $created{v1}, 'clone + index v1 synced ->created_at');
+
+		$f = "$d/t2/msgmap.sqlite3";
+		$ca = PublicInbox::Msgmap->new_file($f)->created_at;
+		is($ca, $created{v2}, 'clone + index v2 synced ->created_at');
+	}
+	test_lei(sub {
+		lei_ok qw(inspect num:1 --dir), "$d/t1";
+		ok(ref(json_utf8->decode($lei_out)), 'inspect num: on v1');
+		lei_ok qw(inspect num:1 --dir), "$d/t2";
+		ok(ref(json_utf8->decode($lei_out)), 'inspect num: on v2');
+	});
 }
 
 ok($td->kill, 'killed -httpd');
@@ -186,14 +199,14 @@ $td->join;
 	my $exp = "mirror of https://example.com/src/\n";
 	my $f = "$tmpdir/description";
 	PublicInbox::LeiMirror::set_description($mrr);
-	is(PublicInbox::Inbox::try_cat($f), $exp, 'description set on ENOENT');
+	is(PublicInbox::Git::try_cat($f), $exp, 'description set on ENOENT');
 
 	my $fh;
 	(open($fh, '>', $f) and close($fh)) or xbail $!;
 	PublicInbox::LeiMirror::set_description($mrr);
-	is(PublicInbox::Inbox::try_cat($f), $exp, 'description set on empty');
+	is(PublicInbox::Git::try_cat($f), $exp, 'description set on empty');
 	(open($fh, '>', $f) and print $fh "x\n" and close($fh)) or xbail $!;
-	is(PublicInbox::Inbox::try_cat($f), "x\n",
+	is(PublicInbox::Git::try_cat($f), "x\n",
 		'description preserved if non-default');
 }