run update-copyrights from gnulib for 2019

[public-inbox.git] / t / v2writable.t

diff --git a/t/v2writable.t b/t/v2writable.t
index c7eeee997bb7c189c71de5902c3a6105f74c3ec5..c1c9196fb4df00b088d8a4032f69dc7f58f58f9b 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -7,6 +7,7 @@ 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 $@;
@@ -32,11 +33,8 @@ 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 ("$mainrepo/msgmap.sqlite3",
                glob("$mainrepo/xap*/*"),
@@ -120,6 +118,8 @@ if ('ensure git configs are correct') {
        $mime->header_set('References', '<zz-mid@b>');
        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');
@@ -129,21 +129,10 @@ if ('ensure git configs are correct') {
                'same document') if ($mset1->size);
 }
 
-SKIP: {
+{
        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 $group = 'inbox.comp.test.v2writable';
        my $pi_config = "$mainrepo/pi_config";
        open my $fh, '>', $pi_config or die "open: $!\n";
@@ -156,7 +145,7 @@ SKIP: {
 EOF
        ;
        close $fh or die "close: $!\n";
-       my $sock = IO::Socket::INET->new(%opts);
+       my $sock = tcp_server();
        ok($sock, 'sock created');
        my $pid;
        my $len;
@@ -200,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');
@@ -219,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');
 
@@ -245,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');
@@ -261,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');