t/nntpd: reduce dependencies on internal API

[public-inbox.git] / t / v1-add-remove-add.t

diff --git a/t/v1-add-remove-add.t b/t/v1-add-remove-add.t
index 3facd87e10bb7919e73231ef0033d4a5594478c4..fdf06a96e764dc98c828dc4aef33da0de0a75ea7 100644 (file)
--- a/t/v1-add-remove-add.t
+++ b/t/v1-add-remove-add.t
@@ -1,19 +1,14 @@
-# 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 PublicInbox::Import;
-use File::Temp qw/tempdir/;
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for v1-add-remove-add.t" if $@;
-}
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Search::Xapian));
 require PublicInbox::SearchIdx;
-my $inboxdir = tempdir('pi-add-remove-add-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-is(system(qw(git init --bare), $inboxdir), 0);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
        inboxdir => $inboxdir,
        name => 'test-add-remove-add',
@@ -31,8 +26,9 @@ my $mime = PublicInbox::MIME->create(
        body => "hello world\n",
 );
 my $im = PublicInbox::Import->new($ibx->git, undef, undef, $ibx);
+$im->init_bare;
 ok($im->add($mime), 'message added');
-ok($im->remove($mime), 'message added');
+ok($im->remove($mime), 'message removed');
 ok($im->add($mime), 'message added again');
 $im->done;
 my $rw = PublicInbox::SearchIdx->new($ibx, 1);