X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=1de8c032da14d199f11efdac601ce57e67984ed8;hb=80b887f29b2ec71d025b4c266a1c26314758994c;hp=fa5c786e151112fb2f03a4ed863be8b47bead16b;hpb=098fecd1fe516a00fbfd49622b82be382ebcdab6;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index fa5c786e..1de8c032 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -120,17 +120,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); @@ -224,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); @@ -275,7 +276,7 @@ EOF ok($im->add($mime), 'add excessively long References'); $im->barrier; - 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');