treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/mda_filter_rubylang.t b/t/mda_filter_rubylang.t
index f7d872c9c8d351fa115fde92b8429b9ca824bba0..dbcb275b397d470fa9cfdbc362d6d89fde658f8a 100644 (file)
--- a/t/mda_filter_rubylang.t
+++ b/t/mda_filter_rubylang.t
@@ -1,25 +1,18 @@
-# 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 Test::More;
-use File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use PublicInbox::Config;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
-my @mods = qw(DBD::SQLite Search::Xapian IPC::Run);
-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 = tempdir('mda-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $pi_config = "$tmpdir/pi_config";
 local $ENV{PI_CONFIG} = $pi_config;
 local $ENV{PI_EMERGENCY} = "$tmpdir/emergency";
-my $mda = 'blib/script/public-inbox-mda';
 my @cfg = ('git', 'config', "--file=$pi_config");
 is(system(@cfg, 'publicinboxmda.spamcheck', 'none'), 0);
 
@@ -29,17 +22,17 @@ for my $v (qw(V1 V2)) {
        my $cfgpfx = "publicinbox.$v";
        my $inboxdir = "$tmpdir/$v";
        my $addr = "test-$v\@example.com";
-       my @cmd = ('blib/script/public-inbox-init', "-$v", $v, $inboxdir,
-               "http://example.com/$v", $addr);
-       is(system(@cmd), 0, 'public-inbox init OK');
-       is(system('blib/script/public-inbox-index', $inboxdir), 0);
+       my $cmd = [ '-init', "-$v", $v, $inboxdir,
+               "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",
                'serial:alerts:file=msgmap.sqlite3'), 0);
 
        for my $i (1..2) {
-               local $ENV{ORIGINAL_RECIPIENT} = $addr;
-               my $msg = <<EOF;
+               my $env = { ORIGINAL_RECIPIENT => $addr };
+               my $opt = { 0 => \(<<EOF) };
 From: user\@example.com
 To: $addr
 Subject: blah $i
@@ -49,7 +42,7 @@ Date: Sat, 05 Jan 2019 04:19:17 +0000
 
 something
 EOF
-               ok(IPC::Run::run([$mda], \"$msg"), 'message delivered');
+               ok(run_script(['-mda'], $env, $opt), 'message delivered');
        }
        my $config = PublicInbox::Config->new;
        my $ibx = $config->lookup_name($v);