triewyde: ficks soem speling errrors

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

diff --git a/t/mda.t b/t/mda.t
index 89dedd4a05458a2851530294c1543c5fcfaf20c8..ddc0c27975288fd66d639246da892c6eece94096 100644 (file)
--- a/t/mda.t
+++ b/t/mda.t
@@ -1,15 +1,14 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-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 Email::MIME;
-use File::Temp qw/tempdir/;
 use Cwd qw(getcwd);
 use PublicInbox::MID qw(mid2path);
 use PublicInbox::Git;
-require './t/common.perl';
-my $tmpdir = tempdir('pi-mda-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
 my $pi_config = "$pi_home/config";
@@ -24,6 +23,23 @@ my $faildir = "$home/faildir/";
 my $mime;
 my $git = PublicInbox::Git->new($maindir);
 
+my $fail_bad_header = sub ($$$) {
+       my ($good_rev, $msg, $in) = @_;
+       my @f = glob("$faildir/*/*");
+       unlink @f if @f;
+       my ($out, $err) = ("", "");
+       my $opt = { 0 => \$in, 1 => \$out, 2 => \$err };
+       local $ENV{PATH} = $main_path;
+       ok(run_script(['-mda'], undef, $opt),
+               "no error on undeliverable ($msg)");
+       my $rev = $git->qx(qw(rev-list HEAD));
+       chomp $rev;
+       is($rev, $good_rev, "bad revision not committed ($msg)");
+       @f = glob("$faildir/*/*");
+       is(scalar @f, 1, "faildir written to");
+       [ $in, $out, $err ];
+};
+
 {
        ok(-x "$main_bin/spamc",
                "spamc ham mock found (run in top of source tree");
@@ -33,14 +49,13 @@ my $git = PublicInbox::Git->new($maindir);
        is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox");
        is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 
-       my %cfg = (
-               "$cfgpfx.address" => $addr,
-               "$cfgpfx.inboxdir" => $maindir,
-       );
-       while (my ($k,$v) = each %cfg) {
-               is(0, system(qw(git config --file), $pi_config, $k, $v),
-                       "setup $k");
-       }
+       open my $fh, '>>', $pi_config or die;
+       print $fh <<EOF or die;
+[publicinbox "test"]
+       address = $addr
+       inboxdir = $maindir
+EOF
+       close $fh or die;
 }
 
 local $ENV{GIT_COMMITTER_NAME} = eval {
@@ -111,14 +126,14 @@ EOF
                is(scalar @new, 1, "PI_EMERGENCY is written to");
        }
 
-       fail_bad_header($good_rev, "bad recipient", <<"");
+       $fail_bad_header->($good_rev, "bad recipient", <<"");
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Message-Id: <bad-recipient\@example.com>
 Subject: hihi
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
-       my $fail = fail_bad_header($good_rev, "duplicate Message-ID", <<"");
+       my $fail = $fail_bad_header->($good_rev, "duplicate Message-ID", <<"");
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -128,26 +143,26 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
 
        like($fail->[2], qr/CONFLICT/, "duplicate Message-ID message");
 
-       fail_bad_header($good_rev, "missing From:", <<"");
+       $fail_bad_header->($good_rev, "missing From:", <<"");
 To: $addr
 Message-ID: <missing-from\@example.com>
 Subject: hihi
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
-       fail_bad_header($good_rev, "short subject:", <<"");
+       $fail_bad_header->($good_rev, "short subject:", <<"");
 To: $addr
 From: cat\@example.com
 Message-ID: <short-subject\@example.com>
 Subject: a
 Date: Thu, 01 Jan 1970 00:00:00 +0000
 
-       fail_bad_header($good_rev, "no date", <<"");
+       $fail_bad_header->($good_rev, "no date", <<"");
 To: $addr
 From: u\@example.com
 Message-ID: <no-date\@example.com>
 Subject: hihi
 
-       fail_bad_header($good_rev, "bad date", <<"");
+       $fail_bad_header->($good_rev, "bad date", <<"");
 To: $addr
 From: u\@example.com
 Message-ID: <bad-date\@example.com>
@@ -330,20 +345,3 @@ EOF
 }
 
 done_testing();
-
-sub fail_bad_header {
-       my ($good_rev, $msg, $in) = @_;
-       my @f = glob("$faildir/*/*");
-       unlink @f if @f;
-       my ($out, $err) = ("", "");
-       my $opt = { 0 => \$in, 1 => \$out, 2 => \$err };
-       local $ENV{PATH} = $main_path;
-       ok(run_script(['-mda'], undef, $opt),
-               "no error on undeliverable ($msg)");
-       my $rev = $git->qx(qw(rev-list HEAD));
-       chomp $rev;
-       is($rev, $good_rev, "bad revision not commited ($msg)");
-       @f = glob("$faildir/*/*");
-       is(scalar @f, 1, "faildir written to");
-       [ $in, $out, $err ];
-}