X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Freplace.t;h=a44560fc8dc3b806354ef5880b20f38cb0017ad6;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=24f7537c4ed8c1739cf682b720bb376187ba5ab5;hpb=3c39f9c942a6975245fda878e9b957d8d3367662;p=public-inbox.git diff --git a/t/replace.t b/t/replace.t index 24f7537c..a44560fc 100644 --- a/t/replace.t +++ b/t/replace.t @@ -1,23 +1,21 @@ -# 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({ inboxdir => "$tmpdir/testbox", name => $this, @@ -97,8 +95,9 @@ EOF 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(system(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');