treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/v2-add-remove-add.t b/t/v2-add-remove-add.t
index b6c58872d78d7fd1eb0a3fca9535e573d3e0ab95..c427de6e1b938ef9db73eb5a6f6551565afbd985 100644 (file)
--- a/t/v2-add-remove-add.t
+++ b/t/v2-add-remove-add.t
@@ -1,19 +1,16 @@
-# Copyright (C) 2018 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/;
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for v2-add-remove-add.t" if $@;
-}
+use PublicInbox::TestCommon;
+require_git(2.6);
+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',
@@ -35,8 +32,8 @@ ok($im->add($mime), 'message added');
 ok($im->remove($mime), 'message added');
 ok($im->add($mime), 'message added again');
 $im->done;
-my $res = $ibx->recent({limit => 1000});
-is($res->{msgs}->[0]->{mid}, 'a-mid@b', 'message exists in history');
-is(scalar @{$res->{msgs}}, 1, 'only one message in history');
+my $msgs = $ibx->recent({limit => 1000});
+is($msgs->[0]->{mid}, 'a-mid@b', 'message exists in history');
+is(scalar @$msgs, 1, 'only one message in history');
 
 done_testing();