X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=ad946338e0aeb730ba5fa6b6bb6ca41cd61d12dd;hb=e95fbe90accedf079f3ddbd1df8e267e2fe90c2e;hp=8897062abfd04a2d8dbf51da5a2a16fc74145628;hpb=4bebfa0c80ad7f4596a7dca98b39121470a42af0;p=public-inbox.git
diff --git a/t/v2writable.t b/t/v2writable.t
index 8897062a..ad946338 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -1,10 +1,10 @@
-# Copyright (C) 2018-2020 all contributors
+# Copyright (C) 2018-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use PublicInbox::MIME;
-use PublicInbox::ContentId qw(content_digest content_id);
+use PublicInbox::Eml;
+use PublicInbox::ContentHash qw(content_digest content_hash);
use PublicInbox::TestCommon;
use Cwd qw(abs_path);
require_git(2.6);
@@ -17,20 +17,19 @@ my $ibx = {
inboxdir => $inboxdir,
name => 'test-v2writable',
version => 2,
+ -no_fsync => 1,
-primary_address => 'test@example.com',
};
$ibx = PublicInbox::Inbox->new($ibx);
-my $mime = PublicInbox::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'test@example.com',
- Subject => 'this is a subject',
- 'Message-ID' => '',
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- ],
- body => "hello world\n",
-);
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Message-ID:
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+hello world
+EOF
my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1});
is($im->{shards}, 1, 'one shard when forced');
ok($im->add($mime), 'ordinary message added');
@@ -65,7 +64,7 @@ if ('ensure git configs are correct') {
@warn = ();
$mime->header_set('Message-Id', '', '');
is($im->add($mime), undef, 'secondary MID ignored if first matches');
- my $sec = PublicInbox::MIME->new($mime->as_string);
+ my $sec = PublicInbox::Eml->new($mime->as_string);
$sec->header_set('Date');
$sec->header_set('Message-Id', '', '');
ok($im->add($sec), 'secondary MID used if data is different');
@@ -92,7 +91,7 @@ if ('ensure git configs are correct') {
my $hdr = $mime->header_obj;
my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr);
unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id');
- my $fake = PublicInbox::MIME->new($mime->as_string);
+ my $fake = PublicInbox::Eml->new($mime->as_string);
$fake->header_set('Message-Id', "<$gen>");
ok($im->add($fake), 'fake added easily');
is_deeply(\@warn, [], 'no warnings from a faker');
@@ -122,17 +121,18 @@ 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;
+ my $total = $ibx->over->dbh->selectrow_array(<<'');
+SELECT COUNT(*) FROM over WHERE num > 0
+
is($ibx->mm->num_highwater, $total, 'got expected highwater value');
- my $srch = $ibx->search;
- my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 });
+ my $mset1 = $ibx->search->reopen->mset('m:abcde@1');
is($mset1->size, 1, 'message found by first MID');
- my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 });
+ my $mset2 = $ibx->search->mset('m:abcde@2');
is($mset2->size, 1, 'message found by second MID');
is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid,
'same document') if ($mset1->size);
- my $alt = $srch->reopen->query('m:alt-id-for-nntp', { mset => 1 });
+ my $alt = $ibx->search->mset('m:alt-id-for-nntp');
is($alt->size, 1, 'message found by alt MID (NNTP)');
is((($alt->items)[0])->get_docid, (($mset1->items)[0])->get_docid,
'same document') if ($mset1->size);
@@ -149,7 +149,7 @@ if ('ensure git configs are correct') {
}
{
- use Net::NNTP;
+ require_mods('Net::NNTP', 1);
my $err = "$inboxdir/stderr.log";
my $out = "$inboxdir/stdout.log";
my $group = 'inbox.comp.test.v2writable';
@@ -165,12 +165,11 @@ EOF
;
close $fh or die "close: $!\n";
my $sock = tcp_server();
- ok($sock, 'sock created');
my $len;
my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
my $env = { PI_CONFIG => $pi_config };
my $td = start_script($cmd, $env, { 3 => $sock });
- my $host_port = $sock->sockhost . ':' . $sock->sockport;
+ my $host_port = tcp_host_port($sock);
my $n = Net::NNTP->new($host_port);
$n->group($group);
my $x = $n->xover('1-');
@@ -217,7 +216,7 @@ EOF
$im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
is($im->{shards}, 1, 'detected single shard from previous');
my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
- is(content_id($rm_mime), content_id($mime),
+ is(content_hash($rm_mime), content_hash($mime),
'removed object returned matches');
ok(defined($mark), 'mark set');
$im->done;
@@ -226,15 +225,15 @@ EOF
like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
'commit message propagated to git');
is_deeply(\@after, \@before, 'only one commit written to git');
- is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
+ my $mid = $smsg->{mid};
+ is($ibx->mm->num_for($mid), undef, 'no longer in Msgmap by mid');
my $num = $smsg->{num};
like($num, qr/\A\d+\z/, 'numeric number in return message');
is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num');
- my $srch = $ibx->search->reopen;
- my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
+ my $mset = $ibx->search->reopen->mset('m:'.$mid);
is($mset->size, 0, 'no longer found in Xapian');
my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
- is($srch->{over_ro}->get_art($num), undef,
+ is($ibx->over->get_art($num), undef,
'removal propagated to Over DB');
my $after = $git0->qx(@log1);
@@ -256,8 +255,8 @@ EOF
{
ok($im->add($mime), 'add message to be purged');
local $SIG{__WARN__} = sub {};
- ok(my $cmts = $im->purge($mime), 'purged message');
- like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit');
+ ok(my $cmt = $im->purge($mime), 'purged message');
+ like($cmt->[0], qr/\A[a-f0-9]{40,}\z/, 'purge returned current commit');
$im->done;
# again
@@ -275,14 +274,13 @@ EOF
$mime->header_set('Message-ID', "<$y>");
$mime->header_set('References', "<$x>");
ok($im->add($mime), 'add excessively long References');
- $im->barrier;
+ $im->done;
- my $msgs = $ibx->search->{over_ro}->get_thread('x'x244);
+ my $msgs = $ibx->over->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');
is($msgs->[1]->{mid}, 'y'x244, 'stored truncated mid(2)');
- $im->done;
}
my $tmp = {
@@ -310,7 +308,7 @@ ok($@, 'V2Writable fails on non-existent dir');
open $fh, '<', $alt or die $!;
my $before = do { local $/; <$fh> };
- ok($v2w->git_init(3), 'init a new epoch');
+ ok($v2w->{mg}->add_epoch(3), 'init a new epoch');
open $fh, '<', $alt or die $!;
my $after = do { local $/; <$fh> };
ok(index($after, $before) > 0,