X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=c2daac2f8484b4feb72ea752948af6cf9ac2cd2f;hb=3c39f9c942a6975245fda878e9b957d8d3367662;hp=06b2251999f08ba0abf7d35035f1bdacac82d28f;hpb=cd50d183273c105a7f08b1875ba6f7a51d9f8e9a;p=public-inbox.git

diff --git a/t/v2writable.t b/t/v2writable.t
index 06b22519..c2daac2f 100644
--- 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;
@@ -14,9 +14,9 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 }
 use_ok 'PublicInbox::V2Writable';
 umask 007;
-my $mainrepo = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $inboxdir = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $ibx = {
-	mainrepo => $mainrepo,
+	inboxdir => $inboxdir,
 	name => 'test-v2writable',
 	version => 2,
 	-primary_address => 'test@example.com',
@@ -33,15 +33,12 @@ 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*/*"),
-		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,
@@ -51,10 +48,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)));
@@ -121,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');
@@ -130,34 +129,23 @@ 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 $@;
-	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 <<EOF
 [publicinbox "test-v2writable"]
-	mainrepo = $mainrepo
+	inboxdir = $inboxdir
 	version = 2
 	address = test\@example.com
 	newsgroup = $group
 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;
@@ -201,12 +189,11 @@ 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);
-	is($im->{partitions}, 1, 'detected single partition from previous');
+	$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(@log, qw(--pretty=oneline));
@@ -253,10 +240,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 +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');