diff options
| -rw-r--r-- | lib/PublicInbox/TestCommon.pm | 7 | ||||
| -rw-r--r-- | t/convert-compact.t | 48 |
2 files changed, 25 insertions, 30 deletions
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 6ca69174..c2d07e59 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -593,13 +593,17 @@ sub create_inbox ($$;@) { require PublicInbox::InboxWritable; my ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!); my $dir = "t/data-gen/$base.$ident"; - unless (-d $dir) { + my $new = !-d $dir; + if ($new) { mkdir $dir; # may race -d $dir or BAIL_OUT "$dir could not be created: $!"; } my $lk = bless { lock_path => "$dir/creat.lock" }, 'PublicInbox::Lock'; $opt{inboxdir} = File::Spec->rel2abs($dir); $opt{name} //= $ident; + my $scope = $lk->lock_for_scope; + my $pre_cb = delete $opt{pre_cb}; + $pre_cb->($dir) if $pre_cb && $new; $opt{-no_fsync} = 1; my $no_gc = delete $opt{-no_gc}; my $tmpdir = delete $opt{tmpdir}; @@ -608,7 +612,6 @@ sub create_inbox ($$;@) { my $parallel = delete($opt{importer_parallel}) // 0; my $creat_opt = { nproc => delete($opt{nproc}) // 1 }; my $ibx = PublicInbox::InboxWritable->new({ %opt }, $creat_opt); - my $scope = $lk->lock_for_scope; if (!-f "$dir/creat.stamp") { my $im = $ibx->importer($parallel); $cb->($im, $ibx); diff --git a/t/convert-compact.t b/t/convert-compact.t index cdb9e3f5..7270cab0 100644 --- a/t/convert-compact.t +++ b/t/convert-compact.t @@ -1,31 +1,28 @@ +#!perl -w # Copyright (C) 2018-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::Eml; use PublicInbox::TestCommon; +use PublicInbox::Import; require_git(2.6); require_mods(qw(DBD::SQLite Search::Xapian)); have_xapian_compact or plan skip_all => 'xapian-compact missing for '.__FILE__; - -use_ok 'PublicInbox::V2Writable'; -use PublicInbox::Import; my ($tmpdir, $for_destroy) = tmpdir(); -my $ibx = { - inboxdir => "$tmpdir/v1", - name => 'test-v1', - -primary_address => 'test@example.com', -}; - -PublicInbox::Import::init_bare($ibx->{inboxdir}); -ok(umask(077), 'set restrictive umask'); -xsys_e(qw(git) , "--git-dir=$ibx->{inboxdir}", - qw(config core.sharedRepository 0644)); -$ibx = PublicInbox::Inbox->new($ibx); -my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx); -my $mime = PublicInbox::Eml->new(<<'EOF'); +my $ibx = create_inbox 'v1', indexlevel => 'medium', tmpdir => "$tmpdir/v1", + pre_cb => sub { + my ($inboxdir) = @_; + PublicInbox::Import::init_bare($inboxdir); + xsys_e(qw(git) , "--git-dir=$inboxdir", + qw(config core.sharedRepository 0644)); + }, sub { + my ($im, $ibx) = @_; + $im->done; + umask(077) or BAIL_OUT "umask: $!"; + $_[0] = $im = $ibx->importer(0); + my $eml = PublicInbox::Eml->new(<<'EOF'); From: a@example.com To: b@example.com Subject: this is a subject @@ -34,16 +31,11 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 hello world EOF - -ok($im->add($mime), 'added one message'); -ok($im->remove($mime), 'remove message'); -ok($im->add($mime), 'added message again'); -$im->done; -for (1..2) { - eval { PublicInbox::SearchIdx->new($ibx, 1)->index_sync; }; - is($@, '', 'no errors syncing'); -} - + $im->add($eml) or BAIL_OUT '->add'; + $im->remove($eml) or BAIL_OUT '->remove'; + $im->add($eml) or BAIL_OUT '->add'; +}; +umask(077) or BAIL_OUT "umask: $!"; is(((stat("$ibx->{inboxdir}/public-inbox"))[2]) & 07777, 0755, 'sharedRepository respected for v1'); is(((stat("$ibx->{inboxdir}/public-inbox/msgmap.sqlite3"))[2]) & 07777, 0644, |