t/mda.t: avoid needless use of Email::Simple

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

diff --git a/t/mda.t b/t/mda.t
index 3bdccb4995e27394759eab1918d1a0c82c9d623f..fb505146f8feb080db191dfaad9e2f334e0d2957 100644 (file)
--- a/t/mda.t
+++ b/t/mda.t
@@ -7,7 +7,9 @@ use Email::MIME;
 use Cwd qw(getcwd);
 use PublicInbox::MID qw(mid2path);
 use PublicInbox::Git;
+use PublicInbox::InboxWritable;
 use PublicInbox::TestCommon;
+use PublicInbox::Import;
 my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
@@ -34,7 +36,7 @@ my $fail_bad_header = sub ($$$) {
                "no error on undeliverable ($msg)");
        my $rev = $git->qx(qw(rev-list HEAD));
        chomp $rev;
-       is($rev, $good_rev, "bad revision not commited ($msg)");
+       is($rev, $good_rev, "bad revision not committed ($msg)");
        @f = glob("$faildir/*/*");
        is(scalar @f, 1, "faildir written to");
        [ $in, $out, $err ];
@@ -47,7 +49,7 @@ my $fail_bad_header = sub ($$$) {
                "spamc mock found (run in top of source tree");
        is(1, mkdir($home, 0755), "setup ~/ for testing");
        is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox");
-       is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
+       PublicInbox::Import::init_bare($maindir);
 
        open my $fh, '>>', $pi_config or die;
        print $fh <<EOF or die;
@@ -62,12 +64,9 @@ local $ENV{GIT_COMMITTER_NAME} = eval {
        use PublicInbox::MDA;
        use PublicInbox::Address;
        use Encode qw/encode/;
-       my $mbox = 't/utf8.mbox';
-       open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n";
-       my $str = eval { local $/; <$fh> };
-       close $fh;
-       my $msg = Email::MIME->new($str);
-
+       my $eml = 't/utf8.eml';
+       my $msg = PublicInbox::InboxWritable::mime_from_path($eml) or
+               die "failed to open $eml: $!";
        my $from = $msg->header('From');
        my ($author) = PublicInbox::Address::names($from);
        my ($email) = PublicInbox::Address::emails($from);
@@ -88,7 +87,7 @@ die $@ if $@;
        local $ENV{PI_EMERGENCY} = $faildir;
        local $ENV{HOME} = $home;
        local $ENV{ORIGINAL_RECIPIENT} = $addr;
-       my $simple = Email::Simple->new(<<EOF);
+       my $in = <<EOF;
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -97,8 +96,6 @@ Subject: hihi
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-       my $in = $simple->as_string;
-
        # ensure successful message delivery
        {
                local $ENV{PATH} = $main_path;
@@ -178,7 +175,7 @@ Date: deadbeef
        local $ENV{ORIGINAL_RECIPIENT} = $addr;
        local $ENV{PATH} = $main_path;
        my $mid = 'spam-train@example.com';
-       my $simple = Email::Simple->new(<<EOF);
+       my $in = <<EOF;
 From: Spammer <spammer\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -187,8 +184,6 @@ Subject: this message will be trained as spam
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-       my $in = $simple->as_string;
-
        {
                # deliver the spam message, first
                ok(run_script(['-mda'], undef, { 0 => \$in }));
@@ -215,7 +210,7 @@ EOF
        local $ENV{ORIGINAL_RECIPIENT} = $addr;
        local $ENV{PATH} = $main_path;
        my $mid = 'ham-train@example.com';
-       my $simple = Email::Simple->new(<<EOF);
+       my $in = <<EOF;
 From: False-positive <hammer\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -224,8 +219,6 @@ Subject: this message will be trained as spam
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-       my $in = $simple->as_string;
-
        # now train it
        # these should be overridden
        local $ENV{GIT_AUTHOR_EMAIL} = 'trainer@example.com';
@@ -289,7 +282,7 @@ EOF
        local $ENV{PATH} = $main_path;
        my $list_id = 'foo.example.com';
        my $mid = 'list-id-delivery@example.com';
-       my $simple = Email::Simple->new(<<EOF);
+       my $in = <<EOF;
 From: user <user\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -299,9 +292,8 @@ Subject: this message will be trained as spam
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 EOF
-       system(qw(git config --file), $pi_config, "$cfgpfx.listid", $list_id);
+       xsys(qw(git config --file), $pi_config, "$cfgpfx.listid", $list_id);
        $? == 0 or die "failed to set listid $?";
-       my $in = $simple->as_string;
        ok(run_script(['-mda'], undef, { 0 => \$in }),
                'mda OK with List-Id match');
        my $path = mid2path($mid);
@@ -309,13 +301,12 @@ EOF
        like($$msg, qr/\Q$list_id\E/, 'delivered message w/ List-ID matches');
 
        # try a message w/o precheck
-       $simple = Email::Simple->new(<<EOF);
+       $in = <<EOF;
 To: You <you\@example.com>
 List-Id: <$list_id>
 
 this message would not be accepted without --no-precheck
 EOF
-       $in = $simple->as_string;
        my ($out, $err) = ('', '');
        my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err };
        ok(run_script(['-mda', '--no-precheck'], undef, $rdr),