X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Freplace.t;h=2efa25f1457e685c7557477331694c88254cedb1;hb=4bd22e9528484c5d964ecba277fd6a7d5e023461;hp=6fae551167ac390658ddee25c0f2278b9cba3dad;hpb=4bb34fb8f29530f6bda5f0d563a74f6289ac312d;p=public-inbox.git
diff --git a/t/replace.t b/t/replace.t
index 6fae5511..2efa25f1 100644
--- a/t/replace.t
+++ b/t/replace.t
@@ -1,25 +1,23 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use PublicInbox::MIME;
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,
-primary_address => 'test@example.com',
@@ -95,10 +93,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');
@@ -184,7 +183,7 @@ test_replace(2, 'basic', $opt);
test_replace(2, 'basic', $opt = { %$opt, post => *pad_msgs });
test_replace(2, 'basic', $opt = { %$opt, rotate_bytes => 1 });
-SKIP: if ('test xapian') {
+SKIP: {
require PublicInbox::Search;
PublicInbox::Search::load_xapian() or skip 'Search::Xapian missing', 8;
for my $l (qw(medium)) {