treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/admin.t b/t/admin.t
index cc1e65d12fc90f03a3775dc3c4c2189d97d0a529..41aebe46b3d61448f6a11e0b98f2dd4db26340d7 100644 (file)
--- a/t/admin.t
+++ b/t/admin.t
@@ -1,12 +1,11 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-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);
-# use Cwd qw(getcwd);
+use PublicInbox::TestCommon;
 use_ok 'PublicInbox::Admin', qw(resolve_repo_dir);
-my $tmpdir = tempdir('pi-admin.XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/v1";
 my $v2_dir = "$tmpdir/v2";
 my ($res, $err, $v);
@@ -51,13 +50,13 @@ SKIP: {
 
 # v2
 SKIP: {
-       for my $m (qw(DBD::SQLite Search::Xapian)) {
+       for my $m (qw(DBD::SQLite)) {
                skip "$m missing", 5 unless eval "require $m";
        }
        use_ok 'PublicInbox::V2Writable';
        use_ok 'PublicInbox::Inbox';
        my $ibx = PublicInbox::Inbox->new({
-                       mainrepo => $v2_dir,
+                       inboxdir => $v2_dir,
                        name => 'test-v2writable',
                        version => 2,
                        -primary_address => 'test@example.com',