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 6520A1FC0B for ; Mon, 15 Mar 2021 11:58:28 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 07/35] t/v2dupindex: create_inbox Date: Mon, 15 Mar 2021 12:57:58 +0100 Message-Id: <20210315115826.17591-8-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 hundred milliseconds or so saved. --- t/v2dupindex.t | 76 +++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/t/v2dupindex.t b/t/v2dupindex.t index 4b20c8e0..3339cc10 100644 --- a/t/v2dupindex.t +++ b/t/v2dupindex.t @@ -4,49 +4,49 @@ # we can index a message from a mirror which bypasses dedupe. use strict; -use Test::More; +use v5.10.1; use PublicInbox::TestCommon; +use PublicInbox::Import; +use PublicInbox::Git; require_git(2.6); require_mods(qw(DBD::SQLite)); my ($tmpdir, $for_destroy) = tmpdir(); -use_ok 'PublicInbox::Import'; -use_ok 'PublicInbox::Git'; -use_ok 'PublicInbox::InboxWritable'; -my $ibx = PublicInbox::InboxWritable->new({ - inboxdir => $tmpdir, - name => 'test-v2dupindex', - version => 2, - indexlevel => 'basic', - -primary_address => 'test@example.com', -}, { nproc => 1 }); -$ibx->init_inbox(1); -my $v2w = $ibx->importer; -$v2w->add(eml_load('t/plack-qp.eml')); -$v2w->add(eml_load('t/mda-mime.eml')); -$v2w->done; - -my $git0 = PublicInbox::Git->new("$tmpdir/git/0.git"); -my $im = PublicInbox::Import->new($git0, undef, undef, $ibx); -$im->{path_type} = 'v2'; -$im->{lock_path} = undef; - -# bypass duplicate filters (->header_set is optional) -my $eml = eml_load('t/plack-qp.eml'); -$eml->header_set('X-This-Is-Not-Checked-By-ContentHash', 'blah'); -ok($im->add($eml), 'add seen message directly'); -ok($im->add(eml_load('t/mda-mime.eml')), 'add another seen message directly'); - -ok($im->add(eml_load('t/iso-2202-jp.eml')), 'add another new message'); -$im->done; - -# mimic a fresh clone by dropping indices -my @sqlite = (glob("$tmpdir/*sqlite3*"), glob("$tmpdir/xap*/*sqlite3*")); -is(unlink(@sqlite), scalar(@sqlite), 'unlinked SQLite indices'); -my @shards = glob("$tmpdir/xap*/?"); -is(scalar(@shards), 0, 'no Xapian shards to drop'); - +my $inboxdir = "$tmpdir/test"; +my $ibx = create_inbox('test', indexlevel => 'basic', version => 2, + tmpdir => $inboxdir, sub { + my ($im, $ibx) = @_; + $im->add(eml_load('t/plack-qp.eml')); + $im->add(eml_load('t/mda-mime.eml')); + $im->done; + + # bypass duplicate filters (->header_set is optional) + my $git0 = PublicInbox::Git->new("$ibx->{inboxdir}/git/0.git"); + $_[0] = undef; + $im = PublicInbox::Import->new($git0, undef, undef, $ibx); + $im->{path_type} = 'v2'; + $im->{lock_path} = undef; + + my $eml = eml_load('t/plack-qp.eml'); + $eml->header_set('X-This-Is-Not-Checked-By-ContentHash', 'blah'); + $im->add($eml) or BAIL_OUT 'add seen message directly'; + $im->add(eml_load('t/mda-mime.eml')) or + BAIL_OUT 'add another seen message directly'; + $im->add(eml_load('t/iso-2202-jp.eml')) or + BAIL_OUT 'add another new message'; + $im->done; + # mimic a fresh clone by dropping indices + my $dir = $ibx->{inboxdir}; + my @sqlite = (glob("$dir/*sqlite3*"), glob("$dir/xap*/*sqlite3*")); + unlink(@sqlite) == scalar(@sqlite) or + BAIL_OUT 'did not unlink SQLite indices'; + my @shards = glob("$dir/xap*/?"); + scalar(@shards) == 0 or BAIL_OUT 'Xapian shards created unexpectedly'; + open my $fh, '>', "$dir/empty" or BAIL_OUT; + rmdir($_) for glob("$dir/xap*"); +}); +my $env = { PI_CONFIG => "$inboxdir/empty" }; my $rdr = { 2 => \(my $err = '') }; -ok(run_script([qw(-index -Lbasic), $tmpdir], undef, $rdr), '-indexed'); +ok(run_script([qw(-index -Lbasic), $inboxdir ], $env, $rdr), '-indexed'); my @n = $ibx->over->dbh->selectrow_array('SELECT COUNT(*) FROM over'); is_deeply(\@n, [ 3 ], 'identical message not re-indexed'); my $mm = $ibx->mm->{dbh}->selectall_arrayref(<<'');