X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-mirror.t;h=de5246b60bce27c707c2a6e833bfe2655f79771f;hb=dd5a4f6497d4a5d94f61186a85516a56d7db8c29;hp=35b77cf7519671f209542bf282f33ff4d923577d;hpb=715f2505c0aab512ed99631697c0c3edf0062c26;p=public-inbox.git diff --git a/t/lei-mirror.t b/t/lei-mirror.t index 35b77cf7..de5246b6 100644 --- a/t/lei-mirror.t +++ b/t/lei-mirror.t @@ -4,6 +4,7 @@ use strict; use v5.10.1; use PublicInbox::TestCommon; use PublicInbox::Inbox; require_mods(qw(-httpd lei)); +require_cmd('curl'); my $sock = tcp_server(); my ($tmpdir, $for_destroy) = tmpdir(); my $http = 'http://'.tcp_host_port($sock); @@ -18,6 +19,7 @@ test_lei({ tmpdir => $tmpdir }, sub { ok(-f "$t1/public-inbox/msgmap.sqlite3", 't1-mirror indexed'); is(PublicInbox::Inbox::try_cat("$t1/description"), "mirror of $http/t1/\n", 'description set'); + ok(-f "$t1/Makefile", 'convenience Makefile added (v1)'); lei_ok('ls-external'); like($lei_out, qr!\Q$t1\E!, 't1 added to ls-externals'); @@ -26,6 +28,7 @@ test_lei({ tmpdir => $tmpdir }, sub { lei_ok('add-external', $t2, '--mirror', "$http/t2/", \'--mirror v2'); ok(-f "$t2/msgmap.sqlite3", 't2-mirror indexed'); ok(-f "$t2/description", 't2 description'); + ok(-f "$t2/Makefile", 'convenience Makefile added (v2)'); is(PublicInbox::Inbox::try_cat("$t2/description"), "mirror of $http/t2/\n", 'description set'); @@ -62,6 +65,14 @@ test_lei({ tmpdir => $tmpdir }, sub { lei_ok('ls-external'); unlike($lei_out, qr!\Q$d\E!s, 'not added to ls-external'); + $d = "$home/bad-epoch"; + ok(!lei(qw(add-external -q --epoch=0.. --mirror), "$http/t1/", $d), + 'v1 fails on --epoch'); + ok(!-d $d, 'destination not created on unacceptable --epoch'); + ok(!lei(qw(add-external -q --epoch=1 --mirror), "$http/t2/", $d), + 'v2 fails on bad epoch range'); + ok(!-d $d, 'destination not created on bad epoch'); + my %phail = ( HTTPS => 'https://public-inbox.org/' . 'phail', ONION => @@ -91,25 +102,54 @@ SKIP: { my $opt = { -C => $d, 2 => \(my $err) }; ok(!run_script([qw(-clone -q), "$http/404"], undef, $opt), '404 fails'); ok(!-d "$d/404", 'destination not created'); - delete $opt->{2}; ok(run_script([qw(-clone -q -C), $d, "$http/t2"], undef, $opt), '-clone succeeds on v2'); - ok(-d "$d/t2/git/0.git", 'epoch cloned'); + ok(-f "$d/t2/git/0.git/config", 'epoch cloned'); + + # writeBitmaps is the default for bare repos in git 2.22+, + # so we may stop setting it ourselves. + 0 and is(xqx(['git', "--git-dir=$d/t2/git/0.git", 'config', + qw(--bool repack.writeBitmaps)]), "true\n", + 'write bitmaps set (via include.path=all.git/config'); + + is(xqx(['git', "--git-dir=$d/t2/git/0.git", 'config', + qw(include.path)]), "../../all.git/config\n", + 'include.path set'); + + ok(-s "$d/t2/all.git/objects/info/alternates", + 'all.git alternates created'); ok(-f "$d/t2/manifest.js.gz", 'manifest saved'); ok(!-e "$d/t2/mirror.done", 'no leftover mirror.done'); - ok(run_script([qw(-fetch -q -C), "$d/t2"], undef, $opt), + ok(!run_script([qw(-fetch --exit-code -C), "$d/t2"], undef, $opt), '-fetch succeeds w/ manifest.js.gz'); + is($? >> 8, 127, '--exit-code gave 127'); + unlike($err, qr/git --git-dir=\S+ fetch/, 'no fetch done w/ manifest'); unlink("$d/t2/manifest.js.gz") or xbail "unlink $!"; - ok(run_script([qw(-fetch -q -C), "$d/t2"], undef, $opt), + ok(!run_script([qw(-fetch --exit-code -C), "$d/t2"], undef, $opt), '-fetch succeeds w/o manifest.js.gz'); + is($? >> 8, 127, '--exit-code gave 127'); + like($err, qr/git --git-dir=\S+ fetch/, 'fetch forced w/o manifest'); ok(run_script([qw(-clone -q -C), $d, "$http/t1"], undef, $opt), 'cloning v1 works'); ok(-d "$d/t1", 'v1 cloned'); ok(!-e "$d/t1/mirror.done", 'no leftover file'); - ok(run_script([qw(-fetch -q -C), "$d/t1"], undef, $opt), + ok(-f "$d/t1/manifest.js.gz", 'manifest saved'); + ok(!run_script([qw(-fetch --exit-code -C), "$d/t1"], undef, $opt), 'fetching v1 works'); + is($? >> 8, 127, '--exit-code gave 127'); + unlike($err, qr/git --git-dir=\S+ fetch/, 'no fetch done w/ manifest'); + unlink("$d/t1/manifest.js.gz") or xbail "unlink $!"; + my $before = [ glob("$d/t1/*") ]; + ok(!run_script([qw(-fetch --exit-code -C), "$d/t1"], undef, $opt), + 'fetching v1 works w/o manifest.js.gz'); + is($? >> 8, 127, '--exit-code gave 127'); + unlink("$d/t1/FETCH_HEAD"); # git internal + like($err, qr/git --git-dir=\S+ fetch/, 'no fetch done w/ manifest'); + ok(unlink("$d/t1/manifest.js.gz"), 'manifest created'); + my $after = [ glob("$d/t1/*") ]; + is_deeply($before, $after, 'no new files created'); } ok($td->kill, 'killed -httpd');