X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Finit.t;h=94c6184ed891a3760c0f102ad3fdbc44c9683dd2;hb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;hp=182d065cb66461e9037c4fdb832834fb153e2456;hpb=4f95d67d882eec0f058dd62ee83e8b9c973f4a26;p=public-inbox.git diff --git a/t/init.t b/t/init.t index 182d065c..94c6184e 100644 --- a/t/init.t +++ b/t/init.t @@ -1,91 +1,112 @@ -# Copyright (C) 2014-2018 all contributors +# Copyright (C) 2014-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use PublicInbox::Config; -use File::Temp qw/tempdir/; -my $tmpdir = tempdir('pi-init-XXXXXX', TMPDIR => 1, CLEANUP => 1); -use constant pi_init => 'blib/script/public-inbox-init'; -use PublicInbox::Import; +use PublicInbox::TestCommon; +use PublicInbox::Admin; use File::Basename; -open my $null, '>>', '/dev/null'; -my $rdr = { 2 => fileno($null) }; +my ($tmpdir, $for_destroy) = tmpdir(); sub quiet_fail { my ($cmd, $msg) = @_; - # run_die doesn't take absolute paths: - my $path = $ENV{PATH}; - if (index($cmd->[0], '/') >= 0) { - my ($dir, $base) = ($cmd->[0] =~ m!\A(.+)/([^/]+)\z!); - $path = "$dir:$path"; - $cmd->[0] = $base; - } - local $ENV{PATH} = $path; - eval { PublicInbox::Import::run_die($cmd, undef, $rdr) }; - isnt($@, '', $msg); + my $err = ''; + ok(!run_script($cmd, undef, { 2 => \$err, 1 => \$err }), $msg); } { local $ENV{PI_DIR} = "$tmpdir/.public-inbox/"; my $cfgfile = "$ENV{PI_DIR}/config"; - my @cmd = (pi_init, 'blist', "$tmpdir/blist", - qw(http://example.com/blist blist@example.com)); - is(system(@cmd), 0, 'public-inbox-init OK'); + my $cmd = [ '-init', 'blist', "$tmpdir/blist", + qw(http://example.com/blist blist@example.com) ]; + ok(run_script($cmd), 'public-inbox-init OK'); is(read_indexlevel('blist'), '', 'indexlevel unset by default'); ok(-e $cfgfile, "config exists, now"); - is(system(@cmd), 0, 'public-inbox-init OK (idempotent)'); + ok(run_script($cmd), 'public-inbox-init OK (idempotent)'); chmod 0666, $cfgfile or die "chmod failed: $!"; - @cmd = (pi_init, 'clist', "$tmpdir/clist", - qw(http://example.com/clist clist@example.com)); - is(system(@cmd), 0, 'public-inbox-init clist OK'); + $cmd = [ '-init', 'clist', "$tmpdir/clist", + qw(http://example.com/clist clist@example.com)]; + ok(run_script($cmd), 'public-inbox-init clist OK'); is((stat($cfgfile))[2] & 07777, 0666, "permissions preserved"); - @cmd = (pi_init, 'clist', '-V2', "$tmpdir/clist", - qw(http://example.com/clist clist@example.com)); - quiet_fail(\@cmd, 'attempting to init V2 from V1 fails'); + $cmd = [ '-init', 'clist', '-V2', "$tmpdir/clist", + qw(http://example.com/clist clist@example.com) ]; + quiet_fail($cmd, 'attempting to init V2 from V1 fails'); + ok(!-e "$cfgfile.lock", 'no lock leftover after init'); + + open my $lock, '+>', "$cfgfile.lock" or die; + $cmd = [ '-init', 'lock', "$tmpdir/lock", + qw(http://example.com/lock lock@example.com) ]; + ok(-e "$cfgfile.lock", 'lock exists'); + + # this calls exit(): + my $err = ''; + ok(!run_script($cmd, undef, {2 => \$err}), 'lock init failed'); + is($? >> 8, 255, 'got expected exit code on lock failure'); + ok(unlink("$cfgfile.lock"), + '-init did not unlink lock on failure'); } SKIP: { - foreach my $mod (qw(DBD::SQLite Search::Xapian::WritableDatabase)) { - eval "require $mod"; - skip "$mod missing for v2", 2 if $@; - } + require_mods(qw(DBD::SQLite Search::Xapian::WritableDatabase), 2); + require_git(2.6, 1) or skip "git 2.6+ required", 2; local $ENV{PI_DIR} = "$tmpdir/.public-inbox/"; my $cfgfile = "$ENV{PI_DIR}/config"; - my @cmd = (pi_init, '-V2', 'v2list', "$tmpdir/v2list", - qw(http://example.com/v2list v2list@example.com)); - is(system(@cmd), 0, 'public-inbox-init -V2 OK'); + my $cmd = [ '-init', '-V2', 'v2list', "$tmpdir/v2list", + qw(http://example.com/v2list v2list@example.com) ]; + ok(run_script($cmd), 'public-inbox-init -V2 OK'); ok(-d "$tmpdir/v2list", 'v2list directory exists'); ok(-f "$tmpdir/v2list/msgmap.sqlite3", 'msgmap exists'); ok(-d "$tmpdir/v2list/all.git", 'catch-all.git directory exists'); - @cmd = (pi_init, 'v2list', "$tmpdir/v2list", - qw(http://example.com/v2list v2list@example.com)); - is(system(@cmd), 0, 'public-inbox-init is idempotent'); + $cmd = [ '-init', 'v2list', "$tmpdir/v2list", + qw(http://example.com/v2list v2list@example.com) ]; + ok(run_script($cmd), 'public-inbox-init is idempotent'); ok(! -d "$tmpdir/public-inbox" && !-d "$tmpdir/objects", 'idempotent invocation w/o -V2 does not make inbox v1'); is(read_indexlevel('v2list'), '', 'indexlevel unset by default'); - @cmd = (pi_init, 'v2list', "-V1", "$tmpdir/v2list", - qw(http://example.com/v2list v2list@example.com)); - quiet_fail(\@cmd, 'initializing V2 as V1 fails'); + $cmd = [ '-init', 'v2list', "-V1", "$tmpdir/v2list", + qw(http://example.com/v2list v2list@example.com) ]; + quiet_fail($cmd, 'initializing V2 as V1 fails'); foreach my $lvl (qw(medium basic)) { - @cmd = (pi_init, "v2$lvl", '-V2', '-L', $lvl, - "$tmpdir/v2$lvl", "http://example.com/v2$lvl", - "v2$lvl\@example.com"); - is(system(@cmd), 0, "-init -L $lvl"); + my $dir = "$tmpdir/v2$lvl"; + $cmd = [ '-init', "v2$lvl", '-V2', '-L', $lvl, + $dir, "http://example.com/v2$lvl", + "v2$lvl\@example.com" ]; + ok(run_script($cmd), "-init -L $lvl"); is(read_indexlevel("v2$lvl"), $lvl, "indexlevel set to '$lvl'"); + my $ibx = PublicInbox::Inbox->new({ inboxdir => $dir }); + is(PublicInbox::Admin::detect_indexlevel($ibx), $lvl, + 'detected expected level w/o config'); } + + # loop for idempotency + for (1..2) { + $cmd = [ '-init', '-V2', '-S1', 'skip1', "$tmpdir/skip1", + qw(http://example.com/skip1 skip1@example.com) ]; + ok(run_script($cmd), "--skip-epoch 1"); + my $gits = [ glob("$tmpdir/skip1/git/*.git") ]; + is_deeply($gits, ["$tmpdir/skip1/git/1.git"], 'skip OK'); + } + + + $cmd = [ '-init', '-V2', '--skip-epoch=2', 'skip2', "$tmpdir/skip2", + qw(http://example.com/skip2 skip2@example.com) ]; + ok(run_script($cmd), "--skip-epoch 2"); + my $gits = [ glob("$tmpdir/skip2/git/*.git") ]; + is_deeply($gits, ["$tmpdir/skip2/git/2.git"], 'skipping 2 works, too'); } done_testing(); sub read_indexlevel { my ($inbox) = @_; - local $ENV{GIT_CONFIG} = "$ENV{PI_DIR}/config"; - chomp(my $lvl = `git config publicinbox.$inbox.indexlevel`); + my $cmd = [ qw(git config), "publicinbox.$inbox.indexlevel" ]; + my $env = { GIT_CONFIG => "$ENV{PI_DIR}/config" }; + chomp(my $lvl = xqx($cmd, $env)); $lvl; }