X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2-add-remove-add.t;h=c427de6e1b938ef9db73eb5a6f6551565afbd985;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=c758dbb6728e8dd7a27a9a8f2812c45fdce2700f;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git

diff --git a/t/v2-add-remove-add.t b/t/v2-add-remove-add.t
index c758dbb6..c427de6e 100644
--- a/t/v2-add-remove-add.t
+++ b/t/v2-add-remove-add.t
@@ -1,21 +1,16 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2020 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 PublicInbox::MIME;
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for v2-add-remove-add.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
-my $mainrepo = tempdir('pi-add-remove-add-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
-	mainrepo => "$mainrepo/v2",
+	inboxdir => "$inboxdir/v2",
 	name => 'test-v2writable',
 	version => 2,
 	-primary_address => 'test@example.com',