X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid_v2.t;h=f31061c2f8c94cc35747218a89a5afe65134b52c;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=87f1452bf9ac4aec6a5a1038f089315639bbca20;hpb=cfb8d16578e7f2f2e300f9f436205e4a8fc7f322;p=public-inbox.git

diff --git a/t/altid_v2.t b/t/altid_v2.t
index 87f1452b..f31061c2 100644
--- a/t/altid_v2.t
+++ b/t/altid_v2.t
@@ -1,23 +1,20 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-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 File::Temp qw/tempdir/;
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for altid_v2.t" if $@;
-}
-
+use PublicInbox::TestCommon;
+require_git(2.6);
+require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
 use_ok 'PublicInbox::Inbox';
-my $tmpdir = tempdir('pi-altidv2-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $mainrepo = "$tmpdir/inbox";
+my ($tmpdir, $for_destroy) = tmpdir();
+my $inboxdir = "$tmpdir/inbox";
 my $full = "$tmpdir/inbox/another-nntp.sqlite3";
 my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
 
 {
-	ok(mkdir($mainrepo), 'created repo for msgmap');
+	ok(mkdir($inboxdir), 'created repo for msgmap');
 	my $mm = PublicInbox::Msgmap->new_file($full, 1);
 	is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set once OK');
 	ok(0 == $mm->mid_set(1234, 'a@example.com'), 'mid_set not idempotent');
@@ -25,7 +22,7 @@ my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
 }
 
 my $ibx = {
-	mainrepo => $mainrepo,
+	inboxdir => $inboxdir,
 	name => 'test-v2writable',
 	version => 2,
 	-primary_address => 'test@example.com',