X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=5760596ca66cda6fcf61f734f41a6c04da6615f4;hb=62f28026e624ed30d620063a0fa92cbedb7f6673;hp=81130df5bc418b97f2a1ceff8cf1e7a128e2d348;hpb=96a27a0a073b61c465240bbbbb05a4c16f67c8d4;p=public-inbox.git
diff --git a/t/cgi.t b/t/cgi.t
index 81130df5..5760596c 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2019 all contributors
# License: AGPL-3.0+
# FIXME: this test is too slow and most non-CGI-requirements
# should be moved over to things which use test_psgi
@@ -6,18 +6,14 @@ use strict;
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;
+require_mods(qw(Plack::Handler::CGI Plack::Util));
+my ($tmpdir, $for_destroy) = tmpdir();
my $home = "$tmpdir/pi-home";
my $pi_home = "$home/.public-inbox";
my $pi_config = "$pi_home/config";
my $maindir = "$tmpdir/main.git";
my $addr = 'test-public@example.com';
-my $cfgpfx = "publicinbox.test";
{
is(1, mkdir($home, 0755), "setup ~/ for testing");
@@ -27,19 +23,16 @@ my $cfgpfx = "publicinbox.test";
open my $fh, '>', "$maindir/description" or die "open: $!\n";
print $fh "test for public-inbox\n";
close $fh or die "close: $!\n";
- my %cfg = (
- "$cfgpfx.address" => $addr,
- "$cfgpfx.mainrepo" => $maindir,
- "$cfgpfx.indexlevel" => 'basic',
- );
- while (my ($k,$v) = each %cfg) {
- is(0, system(qw(git config --file), $pi_config, $k, $v),
- "setup $k");
- }
+ open $fh, '>>', $pi_config or die;
+ print $fh < sub { %ENV = (%ENV, %$env) });
-}
-
sub cgi_run {
my %env = (
PATH_INFO => $_[0],
@@ -162,7 +150,9 @@ sub cgi_run {
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 }
}