Merge remote-tracking branch 'origin/nntp-tls'

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

diff --git a/t/v2writable.t b/t/v2writable.t
index 75110155f3fa9bc0f0729e9acaf828740b79e0d3..8f32fbe5d9c42e9abfd31e33ce70200c46ca03b6 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -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', '<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');
@@ -127,12 +129,9 @@ 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 PublicInbox::DS };
-       skip "PublicInbox::DS missing $@", 2 if $@;
+       use IO::Socket::INET;
        my $err = "$mainrepo/stderr.log";
        my $out = "$mainrepo/stdout.log";
        my %opts = (
@@ -202,7 +201,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));
@@ -261,7 +260,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');