X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=c1c9196fb4df00b088d8a4032f69dc7f58f58f9b;hb=dde1b083571ed893cbb1990f01f9e11ed804cba5;hp=5f34d12798a512d2c96515d652bf9490ac0e3119;hpb=46835d34029c92a2da886e5d0c17ec83cf86a209;p=public-inbox.git
diff --git a/t/v2writable.t b/t/v2writable.t
index 5f34d127..c1c9196f 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;
@@ -34,7 +34,7 @@ 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*/*"),
@@ -118,6 +118,8 @@ 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');
@@ -129,16 +131,8 @@ if ('ensure git configs are correct') {
{
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 $group = 'inbox.comp.test.v2writable';
my $pi_config = "$mainrepo/pi_config";
open my $fh, '>', $pi_config or die "open: $!\n";
@@ -151,7 +145,7 @@ if ('ensure git configs are correct') {
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;
@@ -199,7 +193,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 +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');