X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fconvert-compact.t;h=def09567fefdcdabf8d48100dd5ef1841d2700dd;hb=be55542acc90572da54d828313c2416ae1c902b1;hp=fe8a7ec22fddbaf8c6eba879081f9fbea30a018e;hpb=9c7737d056f832824812086373a13922dd08a0c5;p=public-inbox.git
diff --git a/t/convert-compact.t b/t/convert-compact.t
index fe8a7ec2..def09567 100644
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -1,31 +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::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,
@@ -109,7 +101,7 @@ foreach (@xdir) {
is($st[2] & 07777, -f _ ? 0444 : 0755,
'sharedRepository respected after v2 compact');
}
-my $msgs = $ibx->recent({limit => 1000});
+my $msgs = $ibx->over->recent({limit => 1000});
is($msgs->[0]->{mid}, 'a-mid@b', 'message exists in history');
is(scalar @$msgs, 1, 'only one message in history');