update copyrights for 2021

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

diff --git a/t/cgi.t b/t/cgi.t
index bceb83e57de42608c7e3ad9400afc512af03cbec..3818b99183686538cf37d7555e883f366a11b8f1 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,11 +1,11 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <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;
-use Email::MIME;
+use PublicInbox::Eml;
 use PublicInbox::TestCommon;
 use PublicInbox::Import;
 require_mods(qw(Plack::Handler::CGI Plack::Util));
@@ -39,13 +39,13 @@ use_ok 'PublicInbox::InboxWritable';
 use_ok 'PublicInbox::Config';
 my $cfg = PublicInbox::Config->new($pi_config);
 my $ibx = $cfg->lookup_name('test');
-my $im = PublicInbox::InboxWritable->new($ibx)->importer;
+my $im = PublicInbox::InboxWritable->new($ibx)->importer(0);
 
 {
        local $ENV{HOME} = $home;
 
        # inject some messages:
-       my $mime = Email::MIME->new(<<EOF);
+       my $mime = PublicInbox::Eml->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -62,7 +62,7 @@ EOF
        ok($im->add($mime), 'added big message');
 
        # deliver a reply, too
-       $mime = Email::MIME->new(<<EOF);
+       $mime = PublicInbox::Eml->new(<<EOF);
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
@@ -79,7 +79,7 @@ EOF
        ok($im->add($mime), 'added reply');
 
        my $slashy_mid = 'slashy/asdf@example.com';
-       my $slashy = Email::MIME->new(<<EOF);
+       my $slashy = PublicInbox::Eml->new(<<EOF);
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
@@ -158,7 +158,7 @@ sub cgi_run {
        my ($in, $out, $err) = ("", "", "");
        my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err };
        run_script(['.cgi'], \%env, $rdr);
-       die "unexpected error: \$?=$?" if $?;
+       die "unexpected error: \$?=$? ($err)" if $?;
        my ($head, $body) = split(/\r\n\r\n/, $out, 2);
        { head => $head, body => $body, err => $err }
 }