X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2mirror.t;h=ef9a5405a0dff95cb631731a26280e9addc73f5b;hb=50c822076abee76c3133ffc3482488392eecedfb;hp=0c66aef48d1d9473874e10e265cd662e049af3a3;hpb=678fb3c2ba03a4a284620c039717c0d94dd6106a;p=public-inbox.git diff --git a/t/v2mirror.t b/t/v2mirror.t index 0c66aef4..ef9a5405 100644 --- a/t/v2mirror.t +++ b/t/v2mirror.t @@ -3,20 +3,22 @@ use strict; use warnings; use Test::More; +require './t/common.perl'; +require_git(2.6); # Integration tests for HTTP cloning + mirroring foreach my $mod (qw(Plack::Util Plack::Builder Danga::Socket - HTTP::Date HTTP::Status Search::Xapian DBD::SQLite)) { + 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/; use IO::Socket; use POSIX qw(dup2); -use PublicInbox::V2Writable; +use_ok 'PublicInbox::V2Writable'; use PublicInbox::MIME; use PublicInbox::Config; -use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); # FIXME: too much setup my $tmpdir = tempdir('pi-v2mirror-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $script = 'blib/script/public-inbox'; @@ -45,12 +47,17 @@ To: You Subject: a Date: Thu, 01 Jan 1970 00:00:00 +0000 +my $old_rotate_bytes = $v2w->{rotate_bytes}; +$v2w->{rotate_bytes} = 500; # force rotating for my $i (1..9) { $mime->header_set('Message-ID', "<$i\@example.com>"); $mime->header_set('Subject', "subject = $i"); ok($v2w->add($mime), "add msg $i OK"); } -$v2w->barrier; + +my $epoch_max = $v2w->{epoch_max}; +ok($epoch_max > 0, "multiple epochs"); +$v2w->done; my %opts = ( LocalAddr => '127.0.0.1', @@ -64,26 +71,20 @@ END { kill 'TERM', $pid if defined $pid }; $! = 0; $sock = IO::Socket::INET->new(%opts); ok($sock, 'sock created'); -my $fl = fcntl($sock, F_GETFD, 0); -$pid = fork; -if ($pid == 0) { - # pretend to be systemd - fcntl($sock, F_SETFD, $fl &= ~FD_CLOEXEC); - dup2(fileno($sock), 3) or die "dup2 failed: $!\n"; - $ENV{LISTEN_PID} = $$; - $ENV{LISTEN_FDS} = 1; - exec "$script-httpd", "--stdout=$tmpdir/out", "--stderr=$tmpdir/err"; - die "FAIL: $!\n"; -} -ok(defined $pid, 'forked httpd process successfully'); +my $cmd = [ "$script-httpd", "--stdout=$tmpdir/out", "--stderr=$tmpdir/err" ]; +ok(defined($pid = spawn_listener(undef, $cmd, [ $sock ])), + 'spawned httpd process successfully'); my ($host, $port) = ($sock->sockhost, $sock->sockport); $sock = undef; -my @cmd = (qw(git clone --mirror -q), "http://$host:$port/v2/0", - "$tmpdir/m/git/0.git"); +my @cmd; +foreach my $i (0..$epoch_max) { + @cmd = (qw(git clone --mirror -q), "http://$host:$port/v2/$i", + "$tmpdir/m/git/$i.git"); -is(system(@cmd), 0, 'cloned OK'); -ok(-d "$tmpdir/m/git/0.git", 'mirror OK');; + is(system(@cmd), 0, 'cloned OK'); + ok(-d "$tmpdir/m/git/$i.git", 'mirror OK'); +} @cmd = ("$script-init", '-V2', 'm', "$tmpdir/m", 'http://example.com/m', 'alt@example.com'); @@ -94,14 +95,23 @@ my $mibx = { mainrepo => "$tmpdir/m", address => 'alt@example.com' }; $mibx = PublicInbox::Inbox->new($mibx); is_deeply([$mibx->mm->minmax], [$ibx->mm->minmax], 'index synched minmax'); +$v2w->{rotate_bytes} = $old_rotate_bytes; for my $i (10..15) { $mime->header_set('Message-ID', "<$i\@example.com>"); $mime->header_set('Subject', "subject = $i"); ok($v2w->add($mime), "add msg $i OK"); } $v2w->barrier; -is(system('git', "--git-dir=$tmpdir/m/git/0.git", 'fetch', '-q'), 0, - 'fetch successful'); + +sub fetch_each_epoch { + 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(); my $mset = $mibx->search->reopen->query('m:15@example.com', {mset => 1}); is(scalar($mset->items), 0, 'new message not found in mirror, yet'); @@ -131,21 +141,11 @@ 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'); -is(system('git', "--git-dir=$tmpdir/m/git/0.git", 'fetch', '-q'), 0, - 'fetch successful'); +fetch_each_epoch(); { - open my $err, '+>', "$tmpdir/index-err" or die "open: $!"; - my $ipid = fork; - if ($ipid == 0) { - dup2(fileno($err), 2) or die "dup2 failed: $!"; - exec("$script-index", '--prune', "$tmpdir/m"); - die "exec fail: $!"; - } - ok($ipid, 'running index..'); - is(waitpid($ipid, 0), $ipid, 'index --prune done'); - is($?, 0, 'no error from index'); - ok(seek($err, 0, 0), 'rewound stderr'); - $err = eval { local $/; <$err> }; + my $cmd = [ "$script-index", '--prune', "$tmpdir/m" ]; + my ($in, $out, $err) = ('', '', ''); + ok(IPC::Run::run($cmd, \$in, \$out, \$err), '-index --prune'); like($err, qr/discontiguous range/, 'warned about discontiguous range'); unlike($err, qr/fatal/, 'no scary fatal error shown'); } @@ -166,7 +166,24 @@ is($mibx->git->check($to_purge), undef, 'unindex+prune successful in mirror'); is_deeply(\@warn, [], 'no warnings from index_sync after purge'); } -$v2w->done; +# deletes happen in a different fetch window +{ + $mset = $mibx->search->reopen->query('m:1@example.com', {mset => 1}); + is(scalar($mset->items), 1, '1@example.com visible in mirror'); + $mime->header_set('Message-ID', '<1@example.com>'); + $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'); + 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);