X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fpurge.t;h=a33cd3290fc6ca7b000a1bac0e8e5ec9a4b08e58;hp=384f32a652bfce92eb917093cfbc5ba37002c9bc;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=3c30532aed6256a984c535530c6667552c2e6a84

diff --git a/t/purge.t b/t/purge.t
index 384f32a6..a33cd329 100644
--- a/t/purge.t
+++ b/t/purge.t
@@ -1,25 +1,22 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-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 File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
-my @mods = qw(IPC::Run DBI DBD::SQLite);
-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');
+$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 <<EOF or die "print $!";
 [publicinbox "test-v2purge"]
-	mainrepo = $mainrepo
+	inboxdir = $inboxdir
 	address = test\@example.com
 	indexlevel = basic
 	filter = PublicInbox::Filter::Vger
@@ -83,13 +80,13 @@ EOF
 
 $out = $err = '';
 ok(chdir('/'), "chdir / OK for --all test");
-ok(IPC::Run::run([$purge, '--all'], \$pre_scrub, \$out, \$err),
-	'scrub purge OK');
+$opt->{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";