From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 08/35] t/admin: switch to create_inbox Date: Mon, 15 Mar 2021 12:57:59 +0100 [thread overview] Message-ID: <20210315115826.17591-9-e@80x24.org> (raw) In-Reply-To: <20210315115826.17591-1-e@80x24.org> Over 100ms saved. --- t/admin.t | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/t/admin.t b/t/admin.t index fbfcd6d3..4402c5ae 100644 --- a/t/admin.t +++ b/t/admin.t @@ -1,17 +1,26 @@ +#!perl -w # Copyright (C) 2019-2021 all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> use strict; -use warnings; -use Test::More; +use v5.10.1; use PublicInbox::TestCommon; use PublicInbox::Import; use_ok 'PublicInbox::Admin'; +my $v1 = create_inbox 'v1', sub {}; my ($tmpdir, $for_destroy) = tmpdir(); -my $git_dir = "$tmpdir/v1"; -my $v2_dir = "$tmpdir/v2"; +my $git_dir = $v1->{inboxdir}; my ($res, $err, $v); +my $v2ibx; +SKIP: { + require_mods(qw(DBD::SQLite), 5); + require_git(2.6, 1) or skip 5, 'git too old'; + $v2ibx = create_inbox 'v2', indexlevel => 'basic', version => 2, sub { + my ($v2w, $ibx) = @_; + $v2w->idx_init; + $v2w->importer; + }; +}; -PublicInbox::Import::init_bare($git_dir); *resolve_inboxdir = \&PublicInbox::Admin::resolve_inboxdir; # v1 @@ -51,22 +60,8 @@ SKIP: { } # v2 -SKIP: { - for my $m (qw(DBD::SQLite)) { - skip "$m missing", 5 unless eval "require $m"; - } - use_ok 'PublicInbox::V2Writable'; - use_ok 'PublicInbox::Inbox'; - my $ibx = PublicInbox::Inbox->new({ - inboxdir => $v2_dir, - name => 'test-v2writable', - version => 2, - -primary_address => 'test@example.com', - indexlevel => 'basic', - }); - PublicInbox::V2Writable->new($ibx, 1)->idx_init; - - ok(-e "$v2_dir/inbox.lock", 'exists'); +if ($v2ibx) { + my $v2_dir = $v2ibx->{inboxdir}; is(resolve_inboxdir($v2_dir), $v2_dir, 'resolve_inboxdir works on v2_dir'); chdir($v2_dir) or BAIL_OUT "chdir v2_dir: $!"; @@ -76,7 +71,6 @@ SKIP: { is($res, $v2_dir, 'detects directory along with version'); # TODO: should work from inside Xapian dirs, and git dirs, here... - PublicInbox::Import::init_bare("$v2_dir/git/0.git"); my $objdir = "$v2_dir/git/0.git/objects"; is($v2_dir, resolve_inboxdir($objdir, \$v), 'at $objdir'); is($v, 2, 'version 2 detected at $objdir');
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 ` [PATCH 07/35] t/v2dupindex: create_inbox Eric Wong 2021-03-15 11:57 ` Eric Wong [this message] 2021-03-15 19:51 ` [SQUASH] [PATCH 08/35] t/admin: switch to create_inbox 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-9-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 08/35] t/admin: switch to 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).