From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id EB7F81FD83 for ; Mon, 15 Mar 2021 11:58:33 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 34/35] t/altid_v2: create_inbox Date: Mon, 15 Mar 2021 12:58:25 +0100 Message-Id: <20210315115826.17591-35-e@80x24.org> In-Reply-To: <20210315115826.17591-1-e@80x24.org> References: <20210315115826.17591-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Another 100ms saved --- t/altid_v2.t | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/t/altid_v2.t b/t/altid_v2.t index c6295b2f..493982a1 100644 --- a/t/altid_v2.t +++ b/t/altid_v2.t @@ -1,37 +1,23 @@ +#!perl -w # Copyright (C) 2016-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; -use PublicInbox::Eml; +use v5.10.1; use PublicInbox::TestCommon; +use PublicInbox::Eml; +use PublicInbox::Msgmap; require_git(2.6); require_mods(qw(DBD::SQLite Search::Xapian)); -use_ok 'PublicInbox::V2Writable'; -use_ok 'PublicInbox::Inbox'; -my ($tmpdir, $for_destroy) = tmpdir(); -my $inboxdir = "$tmpdir/inbox"; -my $full = "$tmpdir/inbox/another-nntp.sqlite3"; -my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ]; - -{ - ok(mkdir($inboxdir), 'created repo for msgmap'); - my $mm = PublicInbox::Msgmap->new_file($full, 1); - is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set once OK'); +my $another = 'another-nntp.sqlite3'; +my $altid = [ "serial:gmane:file=$another" ]; +my $ibx = create_inbox 'v2', version => 2, indexlevel => 'medium', + altid => $altid, sub { + my ($im, $ibx) = @_; + my $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 1); + $mm->mid_set(1234, 'a@example.com') == 1 or BAIL_OUT 'mid_set once'; ok(0 == $mm->mid_set(1234, 'a@example.com'), 'mid_set not idempotent'); ok(0 == $mm->mid_set(1, 'a@example.com'), 'mid_set fails with dup MID'); -} - -my $ibx = { - inboxdir => $inboxdir, - name => 'test-v2writable', - version => 2, - -primary_address => 'test@example.com', - altid => $altid, -}; -$ibx = PublicInbox::Inbox->new($ibx); -my $v2w = PublicInbox::V2Writable->new($ibx, 1); -$v2w->add(PublicInbox::Eml->new(<<'EOF')); + $im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT; From: a@example.com To: b@example.com Subject: boo! @@ -39,9 +25,11 @@ Message-ID: hello world gmane:666 EOF -$v2w->done; - -my $mset = $ibx->search->reopen->mset('gmane:1234'); +}; +my $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 1); +ok(0 == $mm->mid_set(1234, 'a@example.com'), 'mid_set not idempotent'); +ok(0 == $mm->mid_set(1, 'a@example.com'), 'mid_set fails with dup MID'); +my $mset = $ibx->search->mset('gmane:1234'); my $msgs = $ibx->search->mset_to_smsg($ibx, $mset); $msgs = [ map { $_->{mid} } @$msgs ]; is_deeply($msgs, ['a@example.com'], 'got one match'); @@ -49,5 +37,3 @@ $mset = $ibx->search->mset('gmane:666'); is($mset->size, 0, 'body did NOT match'); done_testing(); - -1;