We moved to PublicInbox::Eml a while back and have no plans
to go back to using Email::MIME, so don't tempt users and
packagers to waste disk space on Email::MIME.
---
 lib/PublicInbox/TestCommon.pm | 1 +
 t/eml.t                       | 6 +++---
 t/import.t                    | 3 ++-
 t/mime.t                      | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 25caaaa9..5f159683 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -266,6 +266,7 @@ sub require_mods {
        }
        return unless @need;
        my $m = join(', ', @need)." missing for $0";
+       $m =~ s/\bEmail::MIME\b/Email::MIME (development purposes only)/;
        skip($m, $maybe) if $maybe;
        plan(skip_all => $m)
 }
diff --git a/t/eml.t b/t/eml.t
index 2e6a441f..690ada57 100644
--- a/t/eml.t
+++ b/t/eml.t
@@ -1,8 +1,8 @@
 #!perl -w
-# Copyright (C) 2020-2021 all contributors <[email protected]>
+# Copyright (C) all contributors <[email protected]>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use v5.10.1; # TODO: check unicode_strings w/ 5.12
 use strict;
-use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::MsgIter qw(msg_part_text);
 my @classes = qw(PublicInbox::Eml);
@@ -355,7 +355,7 @@ if ('maxparts is a feature unique to us') {
 }
 
 SKIP: {
-       require_mods('PublicInbox::MIME', 1);
+       require_mods('Email::MIME', 1);
        my $eml = eml_load 't/utf8.eml';
        my $mime = mime_load 't/utf8.eml';
        for my $h (qw(Subject From To)) {
diff --git a/t/import.t b/t/import.t
index f1d61dae..7e2432e7 100644
--- a/t/import.t
+++ b/t/import.t
@@ -98,7 +98,8 @@ ok($@, 'Import->add fails on non-existent dir');
 
 my @cls = qw(PublicInbox::Eml);
 SKIP: {
-       require_mods('PublicInbox::MIME', 1);
+       require_mods('Email::MIME', 1);
+       require PublicInbox::MIME;
        push @cls, 'PublicInbox::MIME';
 };
 
diff --git a/t/mime.t b/t/mime.t
index 471f0efa..bf54118a 100644
--- a/t/mime.t
+++ b/t/mime.t
@@ -1,10 +1,10 @@
 #!perl -w
-# Copyright (C) 2017-2021 all contributors <[email protected]>
+# Copyright (C) all contributors <[email protected]>
 # This library is free software; you can redistribute it and/or modify
 # it under the same terms as Perl itself.
 # Artistic or GPL-1+ <https://www.gnu.org/licenses/gpl-1.0.txt>
+use v5.10.1; # TODO: check unicode_strings w/ v5.12
 use strict;
-use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::MsgIter;
 my @classes = qw(PublicInbox::Eml);

Reply via email to