X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpurge.t;h=a33cd3290fc6ca7b000a1bac0e8e5ec9a4b08e58;hb=1d88b8639596a549dd972e113b52f9c2d035d529;hp=574935e08e72f1b01eb5700e6a07ba38952d0cb1;hpb=20759636853f59b1d59cd979e72375422de29059;p=public-inbox.git
diff --git a/t/purge.t b/t/purge.t
index 574935e0..a33cd329 100644
--- a/t/purge.t
+++ b/t/purge.t
@@ -1,25 +1,22 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
require_git(2.6);
-my @mods = qw(IPC::Run DBI DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "missing $mod for t/purge.t" if $@;
-};
-use Cwd qw(abs_path);
+require_mods(qw(DBD::SQLite));
+use Cwd qw(abs_path); # we need this since we chdir below
+local $ENV{HOME} = abs_path('t');
my $purge = abs_path('blib/script/public-inbox-purge');
-my $tmpdir = tempdir('pi-purge-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
use_ok 'PublicInbox::V2Writable';
-my $mainrepo = "$tmpdir/v2";
+my $inboxdir = "$tmpdir/v2";
my $ibx = PublicInbox::Inbox->new({
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => 'test-v2purge',
version => 2,
+ -no_fsync => 1,
-primary_address => 'test@example.com',
indexlevel => 'basic',
});
@@ -40,29 +37,29 @@ local $ENV{PI_CONFIG} = $cfgfile;
open my $cfg_fh, '>', $cfgfile or die "open: $!";
my $v2w = PublicInbox::V2Writable->new($ibx, {nproc => 1});
-my $mime = PublicInbox::MIME->new($raw);
+my $mime = PublicInbox::Eml->new($raw);
ok($v2w->add($mime), 'add message to be purged');
$v2w->done;
# failing cases, first:
my $in = "$raw\nMOAR\n";
my ($out, $err) = ('', '');
-ok(IPC::Run::run([$purge, '-f', $mainrepo], \$in, \$out, \$err),
- 'purge -f OK');
+my $opt = { 0 => \$in, 1 => \$out, 2 => \$err };
+ok(run_script([$purge, '-f', $inboxdir], undef, $opt), 'purge -f OK');
$out = $err = '';
-ok(!IPC::Run::run([$purge, $mainrepo], \$in, \$out, \$err),
- 'mismatch fails without -f');
+ok(!run_script([$purge, $inboxdir], undef, $opt), 'mismatch fails without -f');
is($? >> 8, 1, 'missed purge exits with 1');
# a successful case:
-ok(IPC::Run::run([$purge, $mainrepo], \$raw, \$out, \$err), 'match OK');
-like($out, qr/^\t[a-f0-9]{40,}/m, 'removed commit noted');
+$opt->{0} = \$raw;
+ok(run_script([$purge, $inboxdir], undef, $opt), 'match OK');
+like($out, qr/\b[a-f0-9]{40,}/m, 'removed commit noted');
# add (old) vger filter to config file
print $cfg_fh <{0} = \$pre_scrub;
+ok(run_script([$purge, '--all'], undef, $opt), 'scrub purge OK');
+like($out, qr/\b[a-f0-9]{40,}/m, 'removed commit noted');
# diag "out: $out"; diag "err: $err";
$out = $err = '';
-ok(!IPC::Run::run([$purge, '--all' ], \$pre_scrub, \$out, \$err),
+ok(!run_script([$purge, '--all' ], undef, $opt),
'scrub purge not idempotent without -f');
# diag "out: $out"; diag "err: $err";