X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconvert-compact.t;h=7270cab082838539e81cf2d6294abd85a3a29309;hb=21fd0da3bcfba4d3564d262f88d3fd7479b6d5ee;hp=575262e8e5d3360b85825d686c39ba3835ae6e34;hpb=4c2bdcca098792bf1c7fb19d7779d05c436a2f78;p=public-inbox.git
diff --git a/t/convert-compact.t b/t/convert-compact.t
index 575262e8..7270cab0 100644
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -1,32 +1,28 @@
-# Copyright (C) 2018-2020 all contributors
+#!perl -w
+# Copyright (C) 2018-2021 all contributors
# License: AGPL-3.0+
use strict;
-use warnings;
-use Test::More;
+use v5.10.1;
use PublicInbox::Eml;
-use PublicInbox::Spawn qw(which);
use PublicInbox::TestCommon;
+use PublicInbox::Import;
require_git(2.6);
require_mods(qw(DBD::SQLite Search::Xapian));
-which('xapian-compact') or
+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');
-ok(PublicInbox::Import::run_die([qw(git) , "--git-dir=$ibx->{inboxdir}",
- qw(config core.sharedRepository 0644)]), 'set sharedRepository');
-$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
@@ -35,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,