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";
"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;
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
Date: Thu, 01 Jan 1970 00:00:00 +0000
EOF
- my $in = $simple->as_string;
-
# ensure successful message delivery
{
local $ENV{PATH} = $main_path;
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
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 }));
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
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';
"learned ham idempotently ");
# ensure trained email is filtered, too
+ $mime = mime_load 't/mda-mime.eml', sub {
my $html_body = "<html><body>hi</body></html>";
my $parts = [
Email::MIME->create(
)
];
$mid = 'multipart-html-sucks@11';
- $mime = Email::MIME->create(
+ Email::MIME->create(
header_str => [
From => 'a@example.com',
Subject => 'blah',
'Content-Type' => 'multipart/alternative',
],
parts => $parts,
- );
+ )}; # mime_load sub
{
$in = $mime->as_string;
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
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);
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),