remove most internal Email::MIME usage

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

diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t
index 0ea680eef853cdecbde0b40b7c09e6006becd666..2e7d402e5fafb45143c99cc522e95ec458807e86 100644 (file)
--- a/t/watch_filter_rubylang.t
+++ b/t/watch_filter_rubylang.t
@@ -1,17 +1,12 @@
-# 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 PublicInbox::TestCommon;
 use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::Config;
-my @mods = qw(Filesys::Notify::Simple DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for watch_filter_rubylang_v2.t" if $@;
-}
-
+require_mods(qw(Filesys::Notify::Simple DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::WatchMaildir';
 use_ok 'PublicInbox::Emergency';
 my ($tmpdir, $for_destroy) = tmpdir();
@@ -29,7 +24,7 @@ SKIP: {
 
 for my $v (@v) {
        my @warn;
-       $SIG{__WARN__} = sub { push @warn, @_ };
+       local $SIG{__WARN__} = sub { push @warn, @_ };
        my $cfgpfx = "publicinbox.$v";
        my $inboxdir = "$tmpdir/$v";
        my $maildir = "$tmpdir/md-$v";