X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=c2daac2f8484b4feb72ea752948af6cf9ac2cd2f;hb=1bbfab375438f149dcff9047dd0c5ed3a08eed53;hp=85fb6a6d9936fc375035b0698126fd94f8a01e61;hpb=3348ad4b3b1a0865ee58a902953165ea0f4aa4bd;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index 85fb6a6d..c2daac2f 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -1,4 +1,4 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2019 all contributors # License: AGPL-3.0+ use strict; use warnings; @@ -6,14 +6,17 @@ use Test::More; use PublicInbox::MIME; use PublicInbox::ContentId qw(content_digest); use File::Temp qw/tempdir/; +require './t/common.perl'; +require_git(2.6); foreach my $mod (qw(DBD::SQLite Search::Xapian)) { eval "require $mod"; plan skip_all => "$mod missing for nntpd.t" if $@; } use_ok 'PublicInbox::V2Writable'; -my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1); +umask 007; +my $inboxdir = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1); my $ibx = { - mainrepo => $mainrepo, + inboxdir => $inboxdir, name => 'test-v2writable', version => 2, -primary_address => 'test@example.com', @@ -30,19 +33,25 @@ my $mime = PublicInbox::MIME->create( body => "hello world\n", ); -my $im = eval { - local $ENV{NPROC} = '1'; - PublicInbox::V2Writable->new($ibx, 1); -}; -is($im->{partitions}, 1, 'one partition when forced'); +my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1}); +is($im->{shards}, 1, 'one shard when forced'); ok($im->add($mime), 'ordinary message added'); +foreach my $f ("$inboxdir/msgmap.sqlite3", + glob("$inboxdir/xap*/*"), + glob("$inboxdir/xap*/*/*")) { + my @st = stat($f); + my ($bn) = (split(m!/!, $f))[-1]; + is($st[2] & 07777, -f _ ? 0660 : 0770, + "default sharedRepository respected for $bn"); +} + my $git0; if ('ensure git configs are correct') { - my @cmd = (qw(git config), "--file=$mainrepo/all.git/config", + my @cmd = (qw(git config), "--file=$inboxdir/all.git/config", qw(core.sharedRepository 0644)); is(system(@cmd), 0, "set sharedRepository in all.git"); - $git0 = PublicInbox::Git->new("$mainrepo/git/0.git"); + $git0 = PublicInbox::Git->new("$inboxdir/git/0.git"); chomp(my $v = $git0->qx(qw(config core.sharedRepository))); is($v, '0644', 'child repo inherited core.sharedRepository'); chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps))); @@ -68,7 +77,7 @@ if ('ensure git configs are correct') { [ $sec->header_obj->header_raw('Message-Id') ], 'no new Message-Id added'); - my $sane_mid = qr/\A<[\w\-]+\@localhost>\z/; + my $sane_mid = qr/\A<[\w\-\.]+\@\w+>\z/; @warn = (); $mime->header_set('Message-Id', ''); $mime->body_set('different'); @@ -82,7 +91,8 @@ if ('ensure git configs are correct') { @warn = (); $mime->header_set('Message-Id', ''); $mime->body_set('this one needs a random mid'); - my $gen = PublicInbox::Import::digest2mid(content_digest($mime)); + my $hdr = $mime->header_obj; + my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr); unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id'); my $fake = PublicInbox::MIME->new($mime->as_string); $fake->header_set('Message-Id', "<$gen>"); @@ -108,69 +118,41 @@ if ('ensure git configs are correct') { $mime->header_set('References', ''); ok($im->add($mime), 'message with multiple Message-ID'); $im->done; + my ($total, undef) = $ibx->over->recent; + is($ibx->mm->num_highwater, $total, 'got expected highwater value'); my $srch = $ibx->search; my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 }); is($mset1->size, 1, 'message found by first MID'); my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 }); is($mset2->size, 1, 'message found by second MID'); is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid, - 'same document'); + 'same document') if ($mset1->size); } -SKIP: { - use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); +{ use Net::NNTP; - use IO::Socket; - use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); - eval { require Danga::Socket }; - skip "Danga::Socket missing $@", 2 if $@; - my $err = "$mainrepo/stderr.log"; - my $out = "$mainrepo/stdout.log"; - my %opts = ( - LocalAddr => '127.0.0.1', - ReuseAddr => 1, - Proto => 'tcp', - Type => SOCK_STREAM, - Listen => 1024, - ); + my $err = "$inboxdir/stderr.log"; + my $out = "$inboxdir/stdout.log"; my $group = 'inbox.comp.test.v2writable'; - my $pi_config = "$mainrepo/pi_config"; + my $pi_config = "$inboxdir/pi_config"; open my $fh, '>', $pi_config or die "open: $!\n"; print $fh <new(%opts); + my $sock = tcp_server(); ok($sock, 'sock created'); my $pid; my $len; END { kill 'TERM', $pid if defined $pid }; - $! = 0; - my $fl = fcntl($sock, F_GETFD, 0); - ok(! $!, 'no error from fcntl(F_GETFD)'); - is($fl, FD_CLOEXEC, 'cloexec set by default (Perl behavior)'); - $pid = fork; - if ($pid == 0) { - use POSIX qw(dup2); - $ENV{PI_CONFIG} = $pi_config; - # 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; - my $nntpd = 'blib/script/public-inbox-nntpd'; - exec $nntpd, "--stdout=$out", "--stderr=$err"; - die "FAIL: $!\n"; - } - ok(defined $pid, 'forked nntpd process successfully'); - $! = 0; - fcntl($sock, F_SETFD, $fl |= FD_CLOEXEC); - ok(! $!, 'no error from fcntl(F_SETFD)'); + my $nntpd = 'blib/script/public-inbox-nntpd'; + my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ]; + $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]); my $host_port = $sock->sockhost . ':' . $sock->sockport; my $n = Net::NNTP->new($host_port); $n->group($group); @@ -207,14 +189,14 @@ EOF is_deeply([sort keys %lg], [sort keys %$rover], 'XROVER range OK'); }; { - local $ENV{NPROC} = 2; - my @before = $git0->qx(qw(log --pretty=oneline)); - my $before = $git0->qx(qw(log --pretty=raw --raw -r --no-abbrev)); - $im = PublicInbox::V2Writable->new($ibx, 1); - is($im->{partitions}, 1, 'detected single partition from previous'); + my @log = qw(log --no-decorate --no-abbrev --no-notes --no-color); + my @before = $git0->qx(@log, qw(--pretty=oneline)); + my $before = $git0->qx(@log, qw(--pretty=raw --raw -r)); + $im = PublicInbox::V2Writable->new($ibx, {nproc => 2}); + is($im->{shards}, 1, 'detected single shard from previous'); my $smsg = $im->remove($mime, 'test removal'); $im->done; - my @after = $git0->qx(qw(log --pretty=oneline)); + my @after = $git0->qx(@log, qw(--pretty=oneline)); my $tip = shift @after; like($tip, qr/\A[a-f0-9]+ test removal\n\z/s, 'commit message propagated to git'); @@ -226,7 +208,7 @@ EOF my $srch = $ibx->search->reopen; my $mset = $srch->query('m:'.$smsg->mid, { mset => 1}); is($mset->size, 0, 'no longer found in Xapian'); - my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames); + my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames)); is($srch->{over_ro}->get_art($num), undef, 'removal propagated to Over DB'); @@ -252,13 +234,15 @@ EOF ok(my $cmts = $im->purge($mime), 'purged message'); like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit'); $im->done; + + # again + is($im->purge($mime), undef, 'no-op returns undef'); } { - my @warn; my $x = 'x'x250; my $y = 'y'x250; - local $SIG{__WARN__} = sub { push @warn, @_ }; + local $SIG{__WARN__} = sub {}; $mime->header_set('Subject', 'long mid'); $mime->header_set('Message-ID', "<$x>"); ok($im->add($mime), 'add excessively long Message-ID'); @@ -268,7 +252,7 @@ EOF ok($im->add($mime), 'add excessively long References'); $im->barrier; - my $msgs = $ibx->search->reopen->get_thread('x'x244); + my $msgs = $ibx->search->{over_ro}->get_thread('x'x244); is(2, scalar(@$msgs), 'got both messages'); is($msgs->[0]->{mid}, 'x'x244, 'stored truncated mid'); is($msgs->[1]->{references}, '<'.('x'x244).'>', 'stored truncated ref');