X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmda.t;h=863eaf8fe2dda3d3316b84ddb3737b379efebcce;hb=e39585ee2bdcbeaab7b6bd33b3568021042d0879;hp=fb505146f8feb080db191dfaad9e2f334e0d2957;hpb=5f113019334c3fcdcc71e8a573c30ec10f7bcbb9;p=public-inbox.git diff --git a/t/mda.t b/t/mda.t index fb505146..863eaf8f 100644 --- a/t/mda.t +++ b/t/mda.t @@ -3,7 +3,6 @@ use strict; use warnings; use Test::More; -use Email::MIME; use Cwd qw(getcwd); use PublicInbox::MID qw(mid2path); use PublicInbox::Git; @@ -22,7 +21,6 @@ my $fail_path = "$fail_bin:$ENV{PATH}"; # for spamc spam mock my $addr = 'test-public@example.com'; my $cfgpfx = "publicinbox.test"; my $faildir = "$home/faildir/"; -my $mime; my $git = PublicInbox::Git->new($maindir); my $fail_bad_header = sub ($$$) { @@ -233,35 +231,8 @@ EOF "learned ham idempotently "); # ensure trained email is filtered, too - my $html_body = "hi"; - my $parts = [ - Email::MIME->create( - attributes => { - content_type => 'text/html; charset=UTF-8', - encoding => 'base64', - }, - body => $html_body, - ), - Email::MIME->create( - attributes => { - content_type => 'text/plain', - encoding => 'quoted-printable', - }, - body => 'hi = "bye"', - ) - ]; - $mid = 'multipart-html-sucks@11'; - $mime = Email::MIME->create( - header_str => [ - From => 'a@example.com', - Subject => 'blah', - Cc => $addr, - 'Message-ID' => "<$mid>", - 'Content-Type' => 'multipart/alternative', - ], - parts => $parts, - ); - + my $mime = mime_load 't/mda-mime.eml'; + ($mid) = ($mime->header_raw('message-id') =~ /<([^>]+)>/); { $in = $mime->as_string; ok(run_script(['-learn', 'ham'], undef, { 0 => \$in }),