X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fwatch_filter_rubylang.t;h=db48cb2ffde3d60742ed208a305a8cda702a57f0;hb=29c5f2a6fc3b86306a5dbeadfae061d06f2bc6dd;hp=c407887953795176f2bf80f20db86d718b43f96f;hpb=ad6f26f3b9f0e428020d05667987556f8fcbec2f;p=public-inbox.git
diff --git a/t/watch_filter_rubylang.t b/t/watch_filter_rubylang.t
index c4078879..db48cb2f 100644
--- a/t/watch_filter_rubylang.t
+++ b/t/watch_filter_rubylang.t
@@ -1,17 +1,12 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
-require './t/common.perl';
+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(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";