X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2mirror.t;h=dc930d90518e342cd123dffef5e9ebf982e2f2ed;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=f826775cd5d52b013748850c4bdcedf2f7165c13;hpb=ad221e9b2852f6c57ec1692dafa786de60621bb6;p=public-inbox.git diff --git a/t/v2mirror.t b/t/v2mirror.t index f826775c..dc930d90 100644 --- a/t/v2mirror.t +++ b/t/v2mirror.t @@ -1,19 +1,16 @@ -# Copyright (C) 2018-2019 all contributors +# Copyright (C) 2018-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; -require './t/common.perl'; +use PublicInbox::TestCommon; +use Cwd qw(abs_path); require_git(2.6); +local $ENV{HOME} = abs_path('t'); # Integration tests for HTTP cloning + mirroring -foreach my $mod (qw(Plack::Util Plack::Builder - HTTP::Date HTTP::Status Search::Xapian DBD::SQLite - IPC::Run)) { - eval "require $mod"; - plan skip_all => "$mod missing for v2mirror.t" if $@; -} -use File::Temp qw/tempdir/; +require_mods(qw(Plack::Util Plack::Builder + HTTP::Date HTTP::Status Search::Xapian DBD::SQLite)); use IO::Socket; use POSIX qw(dup2); use_ok 'PublicInbox::V2Writable'; @@ -21,8 +18,7 @@ use PublicInbox::InboxWritable; use PublicInbox::MIME; use PublicInbox::Config; # FIXME: too much setup -my $tmpdir = tempdir('pi-v2mirror-XXXXXX', TMPDIR => 1, CLEANUP => 1); -my $script = 'blib/script/public-inbox'; +my ($tmpdir, $for_destroy) = tmpdir(); my $pi_config = "$tmpdir/config"; { open my $fh, '>', $pi_config or die "open($pi_config): $!"; @@ -59,17 +55,12 @@ for my $i (1..9) { my $epoch_max = $v2w->{epoch_max}; ok($epoch_max > 0, "multiple epochs"); $v2w->done; +$ibx->cleanup; -my ($sock, $pid); -END { kill 'TERM', $pid if defined $pid }; - -$! = 0; -$sock = tcp_server(); +my $sock = tcp_server(); ok($sock, 'sock created'); -my $httpd = "$script-httpd"; -my $cmd = [ $httpd, '-W0', "--stdout=$tmpdir/out", "--stderr=$tmpdir/err" ]; -ok(defined($pid = spawn_listener(undef, $cmd, [ $sock ])), - 'spawned httpd process successfully'); +my $cmd = [ '-httpd', '-W0', "--stdout=$tmpdir/out", "--stderr=$tmpdir/err" ]; +my $td = start_script($cmd, undef, { 3 => $sock }); my ($host, $port) = ($sock->sockhost, $sock->sockport); $sock = undef; @@ -84,10 +75,11 @@ foreach my $i (0..$epoch_max) { ok(-d "$tmpdir/m/git/$i.git", "mirror $i OK"); } -@cmd = ("$script-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m', +@cmd = ("-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m', 'alt@example.com'); -is(system(@cmd), 0, 'initialized public-inbox -V2'); -is(system("$script-index", "$tmpdir/m"), 0, 'indexed'); +ok(run_script(\@cmd), 'initialized public-inbox -V2'); + +ok(run_script(['-index', "$tmpdir/m"]), 'indexed'); my $mibx = { inboxdir => "$tmpdir/m", address => 'alt@example.com' }; $mibx = PublicInbox::Inbox->new($mibx); @@ -99,21 +91,22 @@ for my $i (10..15) { $mime->header_set('Subject', "subject = $i"); ok($v2w->add($mime), "add msg $i OK"); } -$v2w->barrier; +$v2w->done; +$ibx->cleanup; -sub fetch_each_epoch { +my $fetch_each_epoch = sub { foreach my $i (0..$epoch_max) { my $dir = "$tmpdir/m/git/$i.git"; is(system('git', "--git-dir=$dir", 'fetch', '-q'), 0, 'fetch successful'); } -} +}; -fetch_each_epoch(); +$fetch_each_epoch->(); my $mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1}); is(scalar($mset->items), 0, 'new message not found in mirror, yet'); -is(system("$script-index", "$tmpdir/m"), 0, 'index updated'); +ok(run_script(["-index", "$tmpdir/m"]), 'index updated'); is_deeply([$mibx->mm->minmax], [$ibx->mm->minmax], 'index synched minmax'); $mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1}); is(scalar($mset->items), 1, 'found message in mirror'); @@ -131,7 +124,7 @@ $mime->header_set('Subject', 'subject = 10'); is_deeply(\@subj, ["# subject = 10"], "only rewrote one"); } -$v2w->barrier; +$v2w->done; my $msgs = $mibx->search->{over_ro}->get_thread('10@example.com'); my $to_purge = $msgs->[0]->{blob}; @@ -139,11 +132,15 @@ like($to_purge, qr/\A[a-f0-9]{40,}\z/, 'read blob to be purged'); $mset = $ibx->search->reopen->query('m:10@example.com', {mset => 1}); is(scalar($mset->items), 0, 'purged message gone from origin'); -fetch_each_epoch(); +$fetch_each_epoch->(); { - my $cmd = [ "$script-index", '--prune', "$tmpdir/m" ]; - my ($in, $out, $err) = ('', '', ''); - ok(IPC::Run::run($cmd, \$in, \$out, \$err), '-index --prune'); + $ibx->cleanup; + PublicInbox::InboxWritable::cleanup($mibx); + $v2w->done; + my $cmd = [ '-index', '--prune', "$tmpdir/m" ]; + my ($out, $err) = ('', ''); + my $opt = { 1 => \$out, 2 => \$err }; + ok(run_script($cmd, undef, $opt), '-index --prune'); like($err, qr/discontiguous range/, 'warned about discontiguous range'); unlike($err, qr/fatal/, 'no scary fatal error shown'); } @@ -172,19 +169,21 @@ is($mibx->git->check($to_purge), undef, 'unindex+prune successful in mirror'); $mime->header_set('Subject', 'subject = 1'); ok($v2w->remove($mime), 'removed <1@example.com> from source'); $v2w->done; - fetch_each_epoch(); - - my ($in, $out, $err) = ('', '', ''); - my $cmd = [ "$script-index", "$tmpdir/m" ]; - ok(IPC::Run::run($cmd, \$in, \$out, \$err), 'index ran'); + $ibx->cleanup; + $fetch_each_epoch->(); + PublicInbox::InboxWritable::cleanup($mibx); + + my $cmd = [ "-index", "$tmpdir/m" ]; + my ($out, $err) = ('', ''); + my $opt = { 1 => \$out, 2 => \$err }; + ok(run_script($cmd, undef, $opt), 'index ran'); is($err, '', 'no errors reported by index'); $mset = $mibx->search->reopen->query('m:1@example.com', {mset => 1}); is(scalar($mset->items), 0, '1@example.com no longer visible in mirror'); } -ok(kill('TERM', $pid), 'killed httpd'); -$pid = undef; -waitpid(-1, 0); +ok($td->kill, 'killed httpd'); +$td->join; done_testing();