X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2-add-remove-add.t;h=ca998334ce1a4510cf440c73e2abd18d4ce522a9;hb=62d1a4da996bd9a664be954f71f78fe052f9df16;hp=438fe3db7367d934da926935f6d35f06a22cf5d9;hpb=fece7fca6aeac74410a813cffcb0da338017d0ed;p=public-inbox.git

diff --git a/t/v2-add-remove-add.t b/t/v2-add-remove-add.t
index 438fe3db..ca998334 100644
--- a/t/v2-add-remove-add.t
+++ b/t/v2-add-remove-add.t
@@ -1,19 +1,13 @@
-# 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 File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
-
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for v2-add-remove-add.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian Email::MIME));
 use_ok 'PublicInbox::V2Writable';
-my $inboxdir = tempdir('pi-add-remove-add-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
 	inboxdir => "$inboxdir/v2",
 	name => 'test-v2writable',
@@ -21,7 +15,7 @@ my $ibx = {
 	-primary_address => 'test@example.com',
 };
 $ibx = PublicInbox::Inbox->new($ibx);
-my $mime = PublicInbox::MIME->create(
+my $mime = Email::MIME->create(
 	header => [
 		From => 'a@example.com',
 		To => 'test@example.com',
@@ -34,7 +28,7 @@ my $mime = PublicInbox::MIME->create(
 my $im = PublicInbox::V2Writable->new($ibx, 1);
 $im->{parallel} = 0;
 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 $msgs = $ibx->recent({limit => 1000});