X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Freplace.t;h=626cbe9b091bedcc9055c603a35fc262a4f29c81;hb=9cfb026469d5d94a0bbcbd11f6e0466db2aebfe1;hp=6fae551167ac390658ddee25c0f2278b9cba3dad;hpb=60321ef7c5e8c2abc395bebadadf77d789a06945;p=public-inbox.git
diff --git a/t/replace.t b/t/replace.t
index 6fae5511..626cbe9b 100644
--- a/t/replace.t
+++ b/t/replace.t
@@ -1,32 +1,31 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::InboxWritable;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
+use Cwd qw(abs_path);
require_git(2.6); # replace is v2 only, for now...
-foreach my $mod (qw(DBD::SQLite)) {
- eval "require $mod";
- plan skip_all => "$mod missing for $0" if $@;
-}
+require_mods(qw(DBD::SQLite));
+local $ENV{HOME} = abs_path('t');
sub test_replace ($$$) {
my ($v, $level, $opt) = @_;
diag "v$v $level replace";
my $this = "pi-$v-$level-replace";
- my $tmpdir = tempdir("$this-tmp-XXXXXX", TMPDIR => 1, CLEANUP => 1);
+ my ($tmpdir, $for_destroy) = tmpdir($this);
my $ibx = PublicInbox::Inbox->new({
- mainrepo => "$tmpdir/testbox",
+ inboxdir => "$tmpdir/testbox",
name => $this,
version => $v,
+ -no_fsync => 1,
-primary_address => 'test@example.com',
indexlevel => $level,
});
- my $orig = PublicInbox::MIME->new(<<'EOF');
+ my $orig = PublicInbox::Eml->new(<<'EOF');
From: Barbra Streisand
To: test@example.com
Subject: confidential
@@ -35,7 +34,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
Top secret info about my house in Malibu...
EOF
- my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer;
+ my $im = PublicInbox::InboxWritable->new($ibx, {nproc=>1})->importer(0);
# fake a bunch of epochs
$im->{rotate_bytes} = $opt->{rotate_bytes} if $opt->{rotate_bytes};
@@ -51,7 +50,7 @@ EOF
my $thread_a = $ibx->over->get_thread('replace@example.com');
my %before = map {; delete($_->{blob}) => $_ } @{$ibx->recent};
- my $reject = PublicInbox::MIME->new($orig->as_string);
+ my $reject = PublicInbox::Eml->new($orig->as_string);
foreach my $mid (['', ''],
[], ['']) {
$reject->header_set('Message-ID', @$mid);
@@ -63,7 +62,7 @@ EOF
# prepare the replacement
my $expect = "Move along, nothing to see here\n";
- my $repl = PublicInbox::MIME->new($orig->as_string);
+ my $repl = PublicInbox::Eml->new($orig->as_string);
$repl->header_set('From', '');
$repl->header_set('Subject', 'redacted');
$repl->header_set('Date', 'Sat, 02 Oct 2010 00:00:00 +0000');
@@ -76,13 +75,13 @@ EOF
for my $tip (@$cmts) {
next if !defined $tip;
$changed_epochs++;
- like($tip, qr/\A[a-f0-9]{40}\z/,
+ like($tip, qr/\A[a-f0-9]{40,}\z/,
'replace returned current commit');
}
is($changed_epochs, 1, 'only one epoch changed');
$im->done;
- my $m = PublicInbox::MIME->new($ibx->msg_by_mid('replace@example.com'));
+ my $m = PublicInbox::Eml->new($ibx->msg_by_mid('replace@example.com'));
is($m->body, $expect, 'replaced message');
is_deeply(\@warn, [], 'no warnings on noop');
@@ -95,10 +94,11 @@ EOF
my $t19931002 = qr/ 749520000 /;
is_deeply([grep(/$t19931002/, @all)], [], "nothing matches $t19931002");
- for my $dir (glob("$ibx->{mainrepo}/git/*.git")) {
+ for my $dir (glob("$ibx->{inboxdir}/git/*.git")) {
my ($bn) = ($dir =~ m!([^/]+)\z!);
- is(system(qw(git --git-dir), $dir, qw(fsck --strict)), 0,
- "git fsck is clean in epoch $bn");
+ is(xsys(qw(git --git-dir), $dir,
+ qw(fsck --strict --no-progress)),
+ 0, "git fsck is clean in epoch $bn");
}
my $thread_b = $ibx->over->get_thread('replace@example.com');
@@ -107,8 +107,8 @@ EOF
if (my $srch = $ibx->search) {
for my $q ('f:streisand', 's:confidential', 'malibu') {
- my $msgs = $srch->query($q);
- is_deeply($msgs, [], "no match for $q");
+ my $mset = $srch->mset($q);
+ is($mset->size, 0, "no match for $q");
}
my @ok = ('f:redactor', 's:redacted', 'nothing to see');
if ($opt->{pre}) {
@@ -120,8 +120,8 @@ EOF
's:message3', 's:message4';
}
for my $q (@ok) {
- my $msgs = $srch->query($q);
- ok($msgs->[0], "got match for $q");
+ my $mset = $srch->mset($q);
+ ok($mset->size, "got match for $q");
}
}
@@ -146,10 +146,12 @@ EOF
is($smsg->{subject}, 'redacted', 'after subject');
is($smsg->{mid}, 'replace@example.com', 'before MID');
}
+ # $git->cleanup; # needed if $im->{parallel};
@warn = ();
is($im->replace($orig, $repl), undef, 'no-op replace returns undef');
is($im->purge($orig), undef, 'no-op purge returns undef');
is_deeply(\@warn, [], 'no warnings on noop');
+ # $im->done; # needed if $im->{parallel}
}
sub pad_msgs {
@@ -160,7 +162,7 @@ sub pad_msgs {
($i, $irt) = each %$i;
}
my $sec = sprintf('%0d', $i);
- my $mime = PublicInbox::MIME->new(<new(<
@@ -178,20 +180,19 @@ EOF
}
}
-my $opt = { pre => *pad_msgs };
+my $opt = { pre => \&pad_msgs };
test_replace(2, 'basic', {});
test_replace(2, 'basic', $opt);
-test_replace(2, 'basic', $opt = { %$opt, post => *pad_msgs });
+test_replace(2, 'basic', $opt = { %$opt, post => \&pad_msgs });
test_replace(2, 'basic', $opt = { %$opt, rotate_bytes => 1 });
-SKIP: if ('test xapian') {
- require PublicInbox::Search;
- PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 8;
+SKIP: {
+ require_mods(qw(Search::Xapian), 8);
for my $l (qw(medium)) {
test_replace(2, $l, {});
- $opt = { pre => *pad_msgs };
+ $opt = { pre => \&pad_msgs };
test_replace(2, $l, $opt);
- test_replace(2, $l, $opt = { %$opt, post => *pad_msgs });
+ test_replace(2, $l, $opt = { %$opt, post => \&pad_msgs });
test_replace(2, $l, $opt = { %$opt, rotate_bytes => 1 });
}
};