-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 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 warnings;
use Test::More;
use Email::MIME;
-use File::Temp qw/tempdir/;
-eval { require IPC::Run };
-plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
-
-use constant CGI => "blib/script/public-inbox.cgi";
-my $tmpdir = tempdir('pi-cgi-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";
close $fh or die "close: $!\n";
my %cfg = (
"$cfgpfx.address" => $addr,
- "$cfgpfx.mainrepo" => $maindir,
+ "$cfgpfx.inboxdir" => $maindir,
"$cfgpfx.indexlevel" => 'basic',
);
while (my ($k,$v) = each %cfg) {
use_ok 'PublicInbox::Git';
use_ok 'PublicInbox::Import';
use_ok 'PublicInbox::Inbox';
-use_ok 'PublicInbox::V1Writable';
+use_ok 'PublicInbox::InboxWritable';
use_ok 'PublicInbox::Config';
my $cfg = PublicInbox::Config->new($pi_config);
my $ibx = $cfg->lookup_name('test');
-my $im = PublicInbox::V1Writable->new($ibx);
+my $im = PublicInbox::InboxWritable->new($ibx)->importer;
{
local $ENV{HOME} = $home;
done_testing();
-sub run_with_env {
- my ($env, @args) = @_;
- IPC::Run::run(@args, init => sub { %ENV = (%ENV, %$env) });
-}
-
sub cgi_run {
my %env = (
PATH_INFO => $_[0],
HTTP_HOST => 'test.example.com',
);
my ($in, $out, $err) = ("", "", "");
- my $rc = run_with_env(\%env, [CGI], \$in, \$out, \$err);
+ my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err };
+ run_script(['.cgi'], \%env, $rdr);
+ die "unexpected error: \$?=$?" if $?;
my ($head, $body) = split(/\r\n\r\n/, $out, 2);
- { head => $head, body => $body, rc => $rc, err => $err }
+ { head => $head, body => $body, err => $err }
}