X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fmda.t;h=ddc0c27975288fd66d639246da892c6eece94096;hb=4da62f284003d75abe7cb35594414eb2224f42bc;hp=35811ac6f19e9a103d338fc7a40c31dc0ede67f8;hpb=dc84f78e4b3c7f5c8384fbf5a6b538ac1826a604;p=public-inbox.git diff --git a/t/mda.t b/t/mda.t index 35811ac6..ddc0c279 100644 --- a/t/mda.t +++ b/t/mda.t @@ -1,18 +1,14 @@ -# Copyright (C) 2014-2019 all contributors +# Copyright (C) 2014-2020 all contributors # License: AGPL-3.0+ use strict; use warnings; use Test::More; use Email::MIME; -use File::Temp qw/tempdir/; use Cwd qw(getcwd); use PublicInbox::MID qw(mid2path); -eval { require IPC::Run }; -plan skip_all => "missing IPC::Run for t/mda.t" if $@; - -my $mda = "blib/script/public-inbox-mda"; -my $learn = "blib/script/public-inbox-learn"; -my $tmpdir = tempdir('pi-mda-XXXXXX', TMPDIR => 1, CLEANUP => 1); +use PublicInbox::Git; +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"; @@ -25,25 +21,41 @@ 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 ($$$) { + 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"); ok(-x "$fail_bin/spamc", "spamc mock found (run in top of source tree"); - ok(-x $mda, "$mda is executable"); 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)"); - 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 < \$in })); + my $rev = $git->qx(qw(rev-list HEAD)); like($rev, qr/\A[a-f0-9]{40}/, "good revision committed"); chomp $rev; - my $cmt = `git --git-dir=$maindir cat-file commit $rev`; - like($cmt, qr/^author Me 0 \+0000\n/m, + my $cmt = $git->cat_file($rev); + like($$cmt, qr/^author Me 0 \+0000\n/m, "author info set correctly"); - like($cmt, qr/^committer test /m, + like($$cmt, qr/^committer test /m, "committer info set correctly"); $good_rev = $rev; } @@ -107,21 +119,21 @@ EOF my @prev = <$faildir/new/*>; is(scalar @prev, 0 , "nothing in PI_EMERGENCY before"); local $ENV{PATH} = $fail_path; - IPC::Run::run([$mda], \$in); - my @revs = `git --git-dir=$maindir rev-list HEAD`; + ok(run_script(['-mda'], undef, { 0 => \$in })); + my @revs = $git->qx(qw(rev-list HEAD)); is(scalar @revs, 1, "bad revision not committed"); my @new = <$faildir/new/*>; 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 To: You Message-Id: 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 To: You Cc: $addr @@ -131,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: 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: 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: Subject: hihi - fail_bad_header($good_rev, "bad date", <<""); + $fail_bad_header->($good_rev, "bad date", <<""); To: $addr From: u\@example.com Message-ID: @@ -179,19 +191,20 @@ EOF { # deliver the spam message, first - IPC::Run::run([$mda], \$in); + ok(run_script(['-mda'], undef, { 0 => \$in })); my $path = mid2path($mid); - my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; - like($msg, qr/\Q$mid\E/, "message delivered"); + my $msg = $git->cat_file("HEAD:$path"); + like($$msg, qr/\Q$mid\E/, "message delivered"); # now train it local $ENV{GIT_AUTHOR_EMAIL} = 'trainer@example.com'; local $ENV{GIT_COMMITTER_EMAIL} = 'trainer@example.com'; - local $ENV{GIT_COMMITTER_NAME} = undef; - IPC::Run::run([$learn, "spam"], \$msg); - is($?, 0, "no failure from learning spam"); - IPC::Run::run([$learn, "spam"], \$msg); - is($?, 0, "no failure from learning spam idempotently"); + local $ENV{GIT_COMMITTER_NAME}; + delete $ENV{GIT_COMMITTER_NAME}; + ok(run_script(['-learn', 'spam'], undef, { 0 => $msg }), + "no failure from learning spam"); + ok(run_script(['-learn', 'spam'], undef, { 0 => $msg }), + "no failure from learning spam idempotently"); } } @@ -218,13 +231,13 @@ EOF local $ENV{GIT_AUTHOR_EMAIL} = 'trainer@example.com'; local $ENV{GIT_COMMITTER_EMAIL} = 'trainer@example.com'; - IPC::Run::run([$learn, "ham"], \$in); - is($?, 0, "learned ham without failure"); + ok(run_script(['-learn', 'ham'], undef, { 0 => \$in }), + "learned ham without failure"); my $path = mid2path($mid); - my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; - like($msg, qr/\Q$mid\E/, "ham message delivered"); - IPC::Run::run([$learn, "ham"], \$in); - is($?, 0, "learned ham idempotently "); + my $msg = $git->cat_file("HEAD:$path"); + like($$msg, qr/\Q$mid\E/, "ham message delivered"); + ok(run_script(['-learn', 'ham'], undef, { 0 => \$in }), + "learned ham idempotently "); # ensure trained email is filtered, too my $html_body = "hi"; @@ -258,12 +271,12 @@ EOF { $in = $mime->as_string; - IPC::Run::run([$learn, "ham"], \$in); - is($?, 0, "learned ham without failure"); + ok(run_script(['-learn', 'ham'], undef, { 0 => \$in }), + "learned ham without failure"); my $path = mid2path($mid); - $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; - like($msg, qr/<\Q$mid\E>/, "ham message delivered"); - unlike($msg, qr//i, ' filtered'); + $msg = $git->cat_file("HEAD:$path"); + like($$msg, qr/<\Q$mid\E>/, "ham message delivered"); + unlike($$msg, qr//i, ' filtered'); } } @@ -272,6 +285,7 @@ EOF local $ENV{PI_EMERGENCY} = $faildir; local $ENV{HOME} = $home; local $ENV{ORIGINAL_RECIPIENT} = undef; + delete $ENV{ORIGINAL_RECIPIENT}; local $ENV{PATH} = $main_path; my $list_id = 'foo.example.com'; my $mid = 'list-id-delivery@example.com'; @@ -288,11 +302,11 @@ EOF system(qw(git config --file), $pi_config, "$cfgpfx.listid", $list_id); $? == 0 or die "failed to set listid $?"; my $in = $simple->as_string; - IPC::Run::run([$mda], \$in); - is($?, 0, 'mda OK with List-Id match'); + ok(run_script(['-mda'], undef, { 0 => \$in }), + 'mda OK with List-Id match'); my $path = mid2path($mid); - my $msg = `git --git-dir=$maindir cat-file blob HEAD:$path`; - like($msg, qr/\Q$list_id\E/, 'delivered message w/ List-ID matches'); + my $msg = $git->cat_file("HEAD:$path"); + like($$msg, qr/\Q$list_id\E/, 'delivered message w/ List-ID matches'); # try a message w/o precheck $simple = Email::Simple->new(<as_string; my ($out, $err) = ('', ''); - IPC::Run::run([$mda, '--no-precheck'], \$in, \$out, \$err); - is($?, 0, 'mda OK with List-Id match and --no-precheck'); - my $cur = `git --git-dir=$maindir diff HEAD~1..HEAD`; + my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err }; + ok(run_script(['-mda', '--no-precheck'], undef, $rdr), + 'mda OK with List-Id match and --no-precheck'); + my $cur = $git->qx(qw(diff HEAD~1..HEAD)); like($cur, qr/this message would not be accepted without --no-precheck/, '--no-precheck delivered message anyways'); @@ -321,27 +336,12 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000 EOF ($out, $err) = ('', ''); - IPC::Run::run([$mda], \$in, \$out, \$err); - is($?, 0, 'mda OK with multiple List-Id matches'); - $cur = `git --git-dir=$maindir diff HEAD~1..HEAD`; + ok(run_script(['-mda'], undef, $rdr), + 'mda OK with multiple List-Id matches'); + $cur = $git->qx(qw(diff HEAD~1..HEAD)); like($cur, qr/Message-ID: <2lids\@example>/, 'multi List-ID match delivered'); like($err, qr/multiple List-ID/, 'warned about multiple List-ID'); } done_testing(); - -sub fail_bad_header { - my ($good_rev, $msg, $in) = @_; - my @f = glob("$faildir/*/*"); - unlink @f if @f; - my ($out, $err) = ("", ""); - local $ENV{PATH} = $main_path; - IPC::Run::run([$mda], \$in, \$out, \$err); - my $rev = `git --git-dir=$maindir 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 ]; -}