X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=63f27f962b896dd89653376f17e463b37311b312;hb=7c5ac90b309bbe76468055e8a9289664ef2dfe37;hp=5f34d12798a512d2c96515d652bf9490ac0e3119;hpb=46835d34029c92a2da886e5d0c17ec83cf86a209;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index 5f34d127..63f27f96 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -1,22 +1,20 @@ -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2019 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use PublicInbox::MIME; use PublicInbox::ContentId qw(content_digest); -use File::Temp qw/tempdir/; -require './t/common.perl'; +use PublicInbox::TestCommon; +use Cwd qw(abs_path); require_git(2.6); -foreach my $mod (qw(DBD::SQLite Search::Xapian)) { - eval "require $mod"; - plan skip_all => "$mod missing for nntpd.t" if $@; -} +require_mods(qw(DBD::SQLite Search::Xapian)); +local $ENV{HOME} = abs_path('t'); use_ok 'PublicInbox::V2Writable'; umask 007; -my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1); +my ($inboxdir, $for_destroy) = tmpdir(); my $ibx = { - mainrepo => $mainrepo, + inboxdir => $inboxdir, name => 'test-v2writable', version => 2, -primary_address => 'test@example.com', @@ -34,11 +32,11 @@ my $mime = PublicInbox::MIME->create( ); my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1}); -is($im->{partitions}, 1, 'one partition when forced'); +is($im->{shards}, 1, 'one shard when forced'); ok($im->add($mime), 'ordinary message added'); -foreach my $f ("$mainrepo/msgmap.sqlite3", - glob("$mainrepo/xap*/*"), - glob("$mainrepo/xap*/*/*")) { +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, @@ -48,10 +46,10 @@ foreach my $f ("$mainrepo/msgmap.sqlite3", 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))); @@ -115,9 +113,12 @@ if ('ensure git configs are correct') { { $mime->header_set('Message-Id', '', ''); + $mime->header_set('X-Alt-Message-Id', ''); $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'); @@ -125,40 +126,45 @@ if ('ensure git configs are correct') { is($mset2->size, 1, 'message found by second MID'); is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid, 'same document') if ($mset1->size); + + my $alt = $srch->reopen->query('m:alt-id-for-nntp', { mset => 1 }); + is($alt->size, 1, 'message found by alt MID (NNTP)'); + is((($alt->items)[0])->get_docid, (($mset1->items)[0])->get_docid, + 'same document') if ($mset1->size); + $mime->header_set('X-Alt-Message-Id'); + + my %uniq; + for my $mid (qw(abcde@1 abcde@2 alt-id-for-nntp)) { + my $msgs = $ibx->over->get_thread($mid); + my $key = join(' ', sort(map { $_->{num} } @$msgs)); + $uniq{$key}++; + } + is(scalar(keys(%uniq)), 1, 'all alt Message-ID queries give same smsg'); + is_deeply([values(%uniq)], [3], '3 queries, 3 results'); } { use Net::NNTP; - use IO::Socket::INET; - 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 }; - my $nntpd = 'blib/script/public-inbox-nntpd'; - my $cmd = [ $nntpd, "--stdout=$out", "--stderr=$err" ]; - $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]); + my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ]; + my $env = { PI_CONFIG => $pi_config }; + my $td = start_script($cmd, $env, { 3 => $sock }); my $host_port = $sock->sockhost . ':' . $sock->sockport; my $n = Net::NNTP->new($host_port); $n->group($group); @@ -199,7 +205,7 @@ EOF 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->{partitions}, 1, 'detected single partition from previous'); + is($im->{shards}, 1, 'detected single shard from previous'); my $smsg = $im->remove($mime, 'test removal'); $im->done; my @after = $git0->qx(@log, qw(--pretty=oneline)); @@ -258,7 +264,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'); @@ -266,4 +272,16 @@ EOF $im->done; } +my $tmp = { + inboxdir => "$inboxdir/non-existent/subdir", + name => 'nope', + version => 2, + -primary_address => 'test@example.com', +}; +eval { + my $nope = PublicInbox::V2Writable->new($tmp); + $nope->add($mime); +}; +ok($@, 'V2Writable fails on non-existent dir'); + done_testing();