t/nntpd: reduce dependencies on internal API

[public-inbox.git] / t / altid.t

diff --git a/t/altid.t b/t/altid.t
index b8d32f781773f018b11aad77e640ef0973fc66ae..3134e6276b54fea21cd943c7210e03e482ae2118 100644 (file)
--- a/t/altid.t
+++ b/t/altid.t
@@ -1,19 +1,15 @@
-# Copyright (C) 2016-2019 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.t" if $@;
-}
-
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::Msgmap';
 use_ok 'PublicInbox::SearchIdx';
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Inbox';
-my $tmpdir = tempdir('pi-altid-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/a.git";
 my $alt_file = "$tmpdir/another-nntp.sqlite3";
 my $altid = [ "serial:gmane:file=$alt_file" ];
@@ -27,9 +23,9 @@ my $ibx;
 }
 
 {
-       is(system(qw(git init -q --bare), $git_dir), 0, 'git init ok');
        my $git = PublicInbox::Git->new($git_dir);
        my $im = PublicInbox::Import->new($git, 'testbox', 'test@example');
+       $im->init_bare;
        $im->add(Email::MIME->create(
                header => [
                        From => 'a@example.com',
@@ -43,7 +39,7 @@ my $ibx;
        $im->done;
 }
 {
-       $ibx = PublicInbox::Inbox->new({mainrepo => $git_dir});
+       $ibx = PublicInbox::Inbox->new({inboxdir => $git_dir});
        $ibx->{altid} = $altid;
        my $rw = PublicInbox::SearchIdx->new($ibx, 1);
        $rw->index_sync;