X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmda_filter_rubylang.t;h=483fcb8554943bfcd664291180ced603307bc03c;hb=0283273a14e1871955f6a9132f4f3f7884ec8a3f;hp=a5b6af3c011ded71d540b4451de762de24a53e48;hpb=3c313f9034aac96182e2efdc2f92c40803626f32;p=public-inbox.git
diff --git a/t/mda_filter_rubylang.t b/t/mda_filter_rubylang.t
index a5b6af3c..483fcb85 100644
--- a/t/mda_filter_rubylang.t
+++ b/t/mda_filter_rubylang.t
@@ -1,29 +1,24 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Config;
use PublicInbox::TestCommon;
require_git(2.6);
-my @mods = qw(DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for mda_filter_rubylang.t" if $@;
-}
-
+require_mods(qw(DBD::SQLite Search::Xapian));
use_ok 'PublicInbox::V2Writable';
my ($tmpdir, $for_destroy) = tmpdir();
my $pi_config = "$tmpdir/pi_config";
local $ENV{PI_CONFIG} = $pi_config;
local $ENV{PI_EMERGENCY} = "$tmpdir/emergency";
my @cfg = ('git', 'config', "--file=$pi_config");
-is(system(@cfg, 'publicinboxmda.spamcheck', 'none'), 0);
+is(xsys(@cfg, 'publicinboxmda.spamcheck', 'none'), 0);
for my $v (qw(V1 V2)) {
my @warn;
- $SIG{__WARN__} = sub { push @warn, @_ };
+ local $SIG{__WARN__} = sub { push @warn, @_ };
my $cfgpfx = "publicinbox.$v";
my $inboxdir = "$tmpdir/$v";
my $addr = "test-$v\@example.com";
@@ -31,8 +26,8 @@ for my $v (qw(V1 V2)) {
"http://example.com/$v", $addr ];
ok(run_script($cmd), 'public-inbox-init');
ok(run_script(['-index', $inboxdir]), 'public-inbox-index');
- is(system(@cfg, "$cfgpfx.filter", 'PublicInbox::Filter::RubyLang'), 0);
- is(system(@cfg, "$cfgpfx.altid",
+ is(xsys(@cfg, "$cfgpfx.filter", 'PublicInbox::Filter::RubyLang'), 0);
+ is(xsys(@cfg, "$cfgpfx.altid",
'serial:alerts:file=msgmap.sqlite3'), 0);
for my $i (1..2) {