No ext_urls

[public-inbox.git] / t / lei-mirror.t

diff --git a/t/lei-mirror.t b/t/lei-mirror.t
index 646ff2b19f98e08a96f145de823fb13f0df212a0..c172483b9b57387d06957ca566cabae5c5ae8038 100644 (file)
--- 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');
@@ -170,12 +170,18 @@ SKIP: {
        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');
@@ -193,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');
 }