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 6885C1FD7A for ; Mon, 15 Mar 2021 11:58:32 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 27/35] t/indexlevels-mirror: use create_inbox Date: Mon, 15 Mar 2021 12:58:18 +0100 Message-Id: <20210315115826.17591-28-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: This saves hundreds of milliseconds and reduces LoC. --- t/indexlevels-mirror.t | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/t/indexlevels-mirror.t b/t/indexlevels-mirror.t index 53826aef..bd140cc4 100644 --- a/t/indexlevels-mirror.t +++ b/t/indexlevels-mirror.t @@ -1,13 +1,12 @@ +#!perl -w # Copyright (C) 2019-2021 all contributors # License: AGPL-3.0+ use strict; -use warnings; -use Test::More; +use v5.10.1; +use PublicInbox::TestCommon; use PublicInbox::Eml; use PublicInbox::Inbox; -use PublicInbox::InboxWritable; require PublicInbox::Admin; -use PublicInbox::TestCommon; my $PI_TEST_VERSION = $ENV{PI_TEST_VERSION} || 2; require_git('2.6') if $PI_TEST_VERSION == 2; require_mods(qw(DBD::SQLite)); @@ -26,18 +25,13 @@ my $import_index_incremental = sub { my $err = ''; my $this = "pi-$v-$level-indexlevels"; my ($tmpdir, $for_destroy) = tmpdir(); + my $ibx = create_inbox "testbox$v", indexlevel => $level, + version => $v, tmpdir => "$tmpdir/v$v", sub { + $mime->header_set('Message-ID', ''); + $_[0]->add($mime) or BAIL_OUT; + }; + my $im = $ibx->importer(0); local $ENV{PI_CONFIG} = "$tmpdir/config"; - my $ibx = PublicInbox::Inbox->new({ - inboxdir => "$tmpdir/testbox", - name => $this, - version => $v, - -primary_address => 'test@example.com', - indexlevel => $level, - }); - my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer(0); - $mime->header_set('Message-ID', ''); - ok($im->add($mime), 'first message added'); - $im->done; # index master (required for v1) my @cmd = (qw(-index -j0), $ibx->{inboxdir}, "-L$level");