www: use Inbox->over where appropriate

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

diff --git a/t/v2writable.t b/t/v2writable.t
index 06b2251999f08ba0abf7d35035f1bdacac82d28f..b0f88d27b75855cc1a77f41f172195b34ee2aeb3 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -33,10 +33,7 @@ my $mime = PublicInbox::MIME->create(
        body => "hello world\n",
 );
 
-my $im = eval {
-       local $ENV{NPROC} = '1';
-       PublicInbox::V2Writable->new($ibx, 1);
-};
+my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1});
 is($im->{partitions}, 1, 'one partition when forced');
 ok($im->add($mime), 'ordinary message added');
 foreach my $f ("$mainrepo/msgmap.sqlite3",
@@ -130,12 +127,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 = (
@@ -201,11 +195,10 @@ EOF
        is_deeply([sort keys %lg], [sort keys %$rover], 'XROVER range OK');
 };
 {
-       local $ENV{NPROC} = 2;
        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, 1);
+       $im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
        is($im->{partitions}, 1, 'detected single partition from previous');
        my $smsg = $im->remove($mime, 'test removal');
        $im->done;
@@ -253,10 +246,9 @@ EOF
 }
 
 {
-       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');
@@ -266,7 +258,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');