From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 07/35] t/v2dupindex: create_inbox Date: Mon, 15 Mar 2021 12:57:58 +0100 [thread overview] Message-ID: <20210315115826.17591-8-e@80x24.org> (raw) In-Reply-To: <20210315115826.17591-1-e@80x24.org> 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(<<'');
next prev parent reply other threads:[~2021-03-15 11:58 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-15 11:57 [PATCH 00/35] memoize inbox creations Eric Wong 2021-03-15 11:57 ` [PATCH 01/35] test_common: add create_inbox helper sub Eric Wong 2021-03-15 11:57 ` [PATCH 02/35] t/lei_xsearch: use create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 03/35] test_common: minor simplifications to setup_public_inboxes Eric Wong 2021-03-15 11:57 ` [PATCH 04/35] t/imapd-tls: switch to create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 05/35] t/www_altid: use create_inbox Eric Wong 2021-03-15 11:57 ` [PATCH 06/35] t/xcpdb-reshard: " Eric Wong 2021-03-15 11:57 ` Eric Wong [this message] 2021-03-15 11:57 ` [PATCH 08/35] t/admin: switch to create_inbox Eric Wong 2021-03-15 19:51 ` [SQUASH] " Eric Wong 2021-03-15 11:58 ` [PATCH 09/35] t/html_index: remove now-worthless test Eric Wong 2021-03-15 11:58 ` [PATCH 10/35] t/plack: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 11/35] t/psgi_attach: convert to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 12/35] t/httpd: " Eric Wong 2021-03-15 11:58 ` [PATCH 13/35] t/convert-compact: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 14/35] t/altid: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 15/35] t/psgi_mount: switch to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 16/35] t/feed: " Eric Wong 2021-03-15 11:58 ` [PATCH 17/35] t/psgi_bad_mids: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 18/35] t/psgi_multipart_not: " Eric Wong 2021-03-15 11:58 ` [PATCH 19/35] t/psgi_scan_all: create_inbox lots saved Eric Wong 2021-03-15 11:58 ` [PATCH 20/35] t/psgi_v2: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 21/35] t/imapd: create_inbox (minor) Eric Wong 2021-03-15 11:58 ` [PATCH 22/35] t/solver_git: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 23/35] t/cgi: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 24/35] t/edit: switch to create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 25/35] t/inbox_idle: " Eric Wong 2021-03-15 11:58 ` [PATCH 26/35] t/lei_xsearch: use create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 27/35] t/indexlevels-mirror: " Eric Wong 2021-03-15 11:58 ` [PATCH 28/35] t/multi-mid: " Eric Wong 2021-03-15 11:58 ` [PATCH 29/35] t/psgi_search: " Eric Wong 2021-03-15 11:58 ` [PATCH 30/35] t/miscsearch: " Eric Wong 2021-03-15 11:58 ` [PATCH 31/35] t/nntpd-tls: " Eric Wong 2021-03-15 11:58 ` [PATCH 32/35] t/nntpd: " Eric Wong 2021-03-15 11:58 ` [PATCH 33/35] t/thread-index-gap: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 34/35] t/altid_v2: create_inbox Eric Wong 2021-03-15 11:58 ` [PATCH 35/35] t/*: disable fsync on tests were create_inbox isn't worth it Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210315115826.17591-8-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 07/35] t/v2dupindex: create_inbox' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).