Over 100ms saved and it's less code to boot. --- t/psgi_bad_mids.t | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-)
diff --git a/t/psgi_bad_mids.t b/t/psgi_bad_mids.t index f23680f8..f92e4f97 100644 --- a/t/psgi_bad_mids.t +++ b/t/psgi_bad_mids.t @@ -1,31 +1,17 @@ +#!perl -w # Copyright (C) 2018-2021 all contributors <[email protected]> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> use strict; -use warnings; -use Test::More; +use v5.10.1; +use PublicInbox::TestCommon; use PublicInbox::Eml; use PublicInbox::Config; -use PublicInbox::TestCommon; my @mods = qw(DBD::SQLite HTTP::Request::Common Plack::Test - URI::Escape Plack::Builder PublicInbox::WWW); + URI::Escape Plack::Builder); require_git 2.6; require_mods(@mods); use_ok($_) for @mods; use_ok 'PublicInbox::WWW'; -use_ok 'PublicInbox::V2Writable'; -my ($inboxdir, $for_destroy) = tmpdir(); -my $cfgpfx = "publicinbox.bad-mids"; -my $ibx = { - inboxdir => $inboxdir, - name => 'bad-mids', - version => 2, - -primary_address => '[email protected]', - indexlevel => 'basic', -}; -$ibx = PublicInbox::Inbox->new($ibx); -my $im = PublicInbox::V2Writable->new($ibx, 1); -$im->{parallel} = 0; - my $msgs = <<''; [email protected]/hehe1"'<foo [email protected]"'<>/foo @@ -36,25 +22,25 @@ [email protected]/../../../../foo [email protected]" onclick="alert(1)" my @mids = split(/\n/, $msgs); -my $i = 0; -foreach my $mid (@mids) { - my $data = << ""; +my $ibx = create_inbox 'bad-mids', version => 2, indexlevel => 'basic', sub { + my ($im) = @_; + my $i = 0; + for my $mid (@mids) { + $im->add(PublicInbox::Eml->new(<<"")) or BAIL_OUT; Subject: test Message-ID: <$mid> From: a\@example.com To: b\@example.com Date: Fri, 02 Oct 1993 00:00:0$i +0000 + $i++; + } +}; - my $mime = PublicInbox::Eml->new(\$data); - ok($im->add($mime), "added $mid"); - $i++ -} -$im->done; - +my $cfgpfx = "publicinbox.bad-mids"; my $cfg = <<EOF; $cfgpfx.address=$ibx->{-primary_address} -$cfgpfx.inboxdir=$inboxdir +$cfgpfx.inboxdir=$ibx->{inboxdir} EOF my $config = PublicInbox::Config->new(\$cfg); my $www = PublicInbox::WWW->new($config); @@ -84,6 +70,4 @@ test_psgi(sub { $www->call(@_) }, sub { } }); -done_testing(); - -1; +done_testing; -- unsubscribe: one-click, see List-Unsubscribe header archive: https://public-inbox.org/meta/
