diff options
Diffstat (limited to 't/mda_filter_rubylang.t')
| -rw-r--r-- | t/mda_filter_rubylang.t | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/t/mda_filter_rubylang.t b/t/mda_filter_rubylang.t index dbcb275b..42fa6101 100644 --- a/t/mda_filter_rubylang.t +++ b/t/mda_filter_rubylang.t @@ -1,33 +1,33 @@ -# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org> +# Copyright (C) 2019-2021 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 PublicInbox::MIME; +use PublicInbox::Eml; use PublicInbox::Config; use PublicInbox::TestCommon; require_git(2.6); -require_mods(qw(DBD::SQLite Search::Xapian)); +require_mods(qw(DBD::SQLite 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"; 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", + ok(run_script([qw(-index -j0), $inboxdir]), 'public-inbox-index'); + 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) { @@ -44,14 +44,14 @@ something EOF ok(run_script(['-mda'], $env, $opt), 'message delivered'); } - my $config = PublicInbox::Config->new; - my $ibx = $config->lookup_name($v); + my $cfg = PublicInbox::Config->new; + my $ibx = $cfg->lookup_name($v); # make sure all serials are searchable: - my ($tot, $msgs); for my $i (1..2) { - ($tot, $msgs) = $ibx->search->query("alerts:$i"); - is($tot, 1, "got one result for alerts:$i"); + my $mset = $ibx->search->mset("alerts:$i"); + is($mset->size, 1, "got one result for alerts:$i"); + my $msgs = $ibx->search->mset_to_smsg($ibx, $mset); is($msgs->[0]->{mid}, "a.$i\@b.com", "got expected MID for $i"); } is_deeply([], \@warn, 'no warnings'); |