t/*.t: reduce -mda calls

Process startup times are atrocious for fast tests and there's far
too much setup involved.  Rely on git-fast-import instead; but
more work is needed in this area.

diff --git a/t/cgi.t b/t/cgi.t
index dcbfb4ce5634e732dd704e44a6c11d9976b844d3..fbdbfbf6a5407847776711d9e865ca653baf2348 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,5 +1,7 @@
 # Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# FIXME: this test is too slow and most non-CGI-requirements
+# should be moved over to things which use test_psgi
 use strict;
 use warnings;
 use Test::More;
@@ -9,22 +11,16 @@ use Cwd;
 use IPC::Run qw/run/;
 
 use constant CGI => "blib/script/public-inbox.cgi";
-my $mda = "blib/script/public-inbox-mda";
 my $index = "blib/script/public-inbox-index";
 my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
 my $pi_config = "$pi_home/config";
 my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
 
 {
-       ok(-x "$main_bin/spamc",
-               "spamc ham 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)");
@@ -42,15 +38,18 @@ my $cfgpfx = "publicinbox.test";
        }
 }
 
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
+use_ok 'PublicInbox::Git';
+use_ok 'PublicInbox::Import';
+use_ok 'Email::MIME';
+my $git = PublicInbox::Git->new($maindir);
+my $im = PublicInbox::Import->new($git, 'test', $addr);
+
 {
        local $ENV{HOME} = $home;
-       local $ENV{ORIGINAL_RECIPIENT} = $addr;
 
        # ensure successful message delivery
        {
-               my $simple = Email::Simple->new(<<EOF);
+               my $mime = Email::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -60,15 +59,15 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 zzzzzz
 EOF
-               my $in = $simple->as_string;
-               run_with_env({PATH => $main_path}, [$mda], \$in);
+               $im->add($mime);
+               $im->done;
                my $rev = `git --git-dir=$maindir rev-list HEAD`;
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
 
        # deliver a reply, too
        {
-               my $reply = Email::Simple->new(<<EOF);
+               my $reply = Email::MIME->new(<<EOF);
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
@@ -82,8 +81,8 @@ Me wrote:
 
 what?
 EOF
-               my $in = $reply->as_string;
-               run_with_env({PATH => $main_path}, [$mda], \$in);
+               $im->add($reply);
+               $im->done;
                my $rev = `git --git-dir=$maindir rev-list HEAD`;
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
@@ -150,7 +149,7 @@ EOF
 {
        local $ENV{HOME} = $home;
        my $slashy_mid = 'slashy/asdf@example.com';
-       my $reply = Email::Simple->new(<<EOF);
+       my $reply = Email::MIME->new(<<EOF);
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
@@ -160,13 +159,8 @@ Date: Thu, 01 Jan 1970 00:00:01 +0000
 
 slashy
 EOF
-       my $in = $reply->as_string;
-
-       {
-               local $ENV{HOME} = $home;
-               local $ENV{ORIGINAL_RECIPIENT} = $addr;
-               run_with_env({PATH => $main_path}, [$mda], \$in);
-       }
+       $im->add($reply);
+       $im->done;
 
        my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
        like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
@@ -200,7 +194,6 @@ EOF
 # retrieve thread as an mbox
 {
        local $ENV{HOME} = $home;
-       local $ENV{PATH} = $main_path;
        my $path = "/test/blahblah%40example.com/t.mbox.gz";
        my $res = cgi_run($path);
        like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled");

diff --git a/t/httpd.t b/t/httpd.t
index 781fe03a83df3791f8d39459b5ddd0a34ef09945..0e19b56805ddde7be2912c775828e17aab67eb96 100644 (file)
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -14,24 +14,16 @@ use Cwd qw/getcwd/;
 use IO::Socket;
 use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
 use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-use IPC::Run;
 
 # FIXME: too much setup
 my $tmpdir = tempdir('pi-httpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
-my $pi_home = "$home/.public-inbox";
-my $pi_config = "$pi_home/config";
 my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
 my $group = 'test-httpd';
 my $addr = $group . '@example.com';
 my $cfgpfx = "publicinbox.$group";
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
-my $mda = 'blib/script/public-inbox-mda';
 my $httpd = 'blib/script/public-inbox-httpd';
 my $init = 'blib/script/public-inbox-init';
 
@@ -44,6 +36,9 @@ my %opts = (
 );
 my $sock = IO::Socket::INET->new(%opts);
 my $pid;
+use_ok 'PublicInbox::Git';
+use_ok 'PublicInbox::Import';
+use_ok 'Email::MIME';
 END { kill 'TERM', $pid if defined $pid };
 {
        local $ENV{HOME} = $home;
@@ -52,8 +47,7 @@ END { kill 'TERM', $pid if defined $pid };
 
        # ensure successful message delivery
        {
-               local $ENV{ORIGINAL_RECIPIENT} = $addr;
-               my $in = <<EOF;
+               my $mime = Email::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -63,9 +57,11 @@ Date: Thu, 01 Jan 1970 06:06:06 +0000
 
 nntp
 EOF
-               local $ENV{PATH} = $main_path;
-               IPC::Run::run([$mda], \$in);
-               is(0, $?, 'ran MDA correctly');
+               $mime->header_set('List-Id', "<$addr>");
+               my $git = PublicInbox::Git->new($maindir);
+               my $im = PublicInbox::Import->new($git, 'test', $addr);
+               $im->add($mime);
+               $im->done($mime);
        }
        ok($sock, 'sock created');
        $! = 0;

diff --git a/t/nntpd.t b/t/nntpd.t
index b026bd56f79aa5ba426bea729207ee9d44672f12..a389a3e9f46e7b592020359e7f1c5cfa93330750 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -16,26 +16,20 @@ use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD);
 use Socket qw(SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
 use File::Temp qw/tempdir/;
 use Net::NNTP;
-use IPC::Run qw(run);
 
 my $tmpdir = tempdir('pi-nntpd-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $home = "$tmpdir/pi-home";
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
-my $pi_home = "$home/.public-inbox";
-my $pi_config = "$pi_home/config";
 my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
 my $group = 'test-nntpd';
 my $addr = $group . '@example.com';
 my $cfgpfx = "publicinbox.$group";
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
-my $mda = 'blib/script/public-inbox-mda';
 my $nntpd = 'blib/script/public-inbox-nntpd';
 my $init = 'blib/script/public-inbox-init';
 my $index = 'blib/script/public-inbox-index';
+use_ok 'PublicInbox::Import';
+use_ok 'PublicInbox::Git';
 
 my %opts = (
        LocalAddr => '127.0.0.1',
@@ -51,11 +45,11 @@ END { kill 'TERM', $pid if defined $pid };
 {
        local $ENV{HOME} = $home;
        system($init, $group, $maindir, 'http://example.com/', $addr);
+       my $len;
 
        # ensure successful message delivery
        {
-               local $ENV{ORIGINAL_RECIPIENT} = $addr;
-               my $simple = Email::Simple->new(<<EOF);
+               my $mime = Email::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -65,13 +59,13 @@ Date: Thu, 01 Jan 1970 06:06:06 +0000
 
 nntp
 EOF
-               my $in = $simple->as_string;
-               local $ENV{PATH} = $main_path;
-               IPC::Run::run([$mda], \$in);
-               is(0, $?, 'ran MDA correctly');
+               $mime->header_set('List-Id', "<$addr>");
+               $len = length($mime->as_string);
+               my $git = PublicInbox::Git->new($maindir);
+               my $im = PublicInbox::Import->new($git, 'test', $addr);
+               $im->add($mime);
+               $im->done;
                is(0, system($index, $maindir), 'indexed git dir');
-               $simple->header_set('List-Id', "<$addr>");
-               $len = length($simple->as_string);
        }
 
        ok($sock, 'sock created');

diff --git a/t/plack.t b/t/plack.t
index 1ae58731ec370bb2a8fe01547023db9861026748..c8dd7bfe818b60e86c58eaf4a05debded8b060de 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -5,36 +5,24 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use File::Temp qw/tempdir/;
-use Cwd;
-use IPC::Run qw/run/;
 my $psgi = "examples/public-inbox.psgi";
-my $mda = "blib/script/public-inbox-mda";
 my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $home = "$tmpdir/pi-home";
-my $pi_home = "$home/.public-inbox";
-my $pi_config = "$pi_home/config";
+my $pi_config = "$tmpdir/config";
 my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
 my @mods = qw(HTTP::Request::Common Plack::Request Plack::Test
        Mail::Thread URI::Escape);
 foreach my $mod (@mods) {
        eval "require $mod";
        plan skip_all => "$mod missing for plack.t" if $@;
 }
+use_ok 'PublicInbox::Import';
+use_ok 'PublicInbox::Git';
 
 foreach my $mod (@mods) { use_ok $mod; }
 {
        ok(-f $psgi, "psgi example file found");
-       ok(-x "$main_bin/spamc",
-               "spamc ham 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)");
        open my $fh, '>', "$maindir/description" or die "open: $!\n";
        print $fh "test for public-inbox\n";
@@ -48,12 +36,9 @@ foreach my $mod (@mods) { use_ok $mod; }
                        "setup $k");
        }
 
-       local $ENV{HOME} = $home;
-       local $ENV{ORIGINAL_RECIPIENT} = $addr;
-
        # ensure successful message delivery
        {
-               my $simple = Email::Simple->new(<<EOF);
+               my $mime = Email::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -63,13 +48,17 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
 
 zzzzzz
 EOF
-               my $in = $simple->as_string;
-               run_with_env({PATH => $main_path}, [$mda], \$in);
-               local $ENV{GIT_DIR} = $maindir;
-               my $rev = `git rev-list HEAD`;
+               my $git = PublicInbox::Git->new($maindir);
+               my $im = PublicInbox::Import->new($git, 'test', $addr);
+               $im->add($mime);
+               $im->done;
+               my $rev = `git --git-dir="$maindir" rev-list HEAD`;
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
        }
-       my $app = require $psgi;
+       my $app = eval {
+               local $ENV{PI_CONFIG} = $pi_config;
+               require $psgi;
+       };
 
        # redirect with trailing /
        test_psgi($app, sub {
@@ -190,9 +179,3 @@ EOF
 }
 
 done_testing();
-
-sub run_with_env {
-       my ($env, @args) = @_;
-       my $init = sub { foreach my $k (keys %$env) { $ENV{$k} = $env->{$k} } };
-       run(@args, init => $init);
-}