]> Sergey Matveev's repositories - public-inbox.git/blobdiff - t/cgi.t
t/cgi.t: shorten %ENV setting
[public-inbox.git] / t / cgi.t
diff --git a/t/cgi.t b/t/cgi.t
index ef32a2845fee9f99a13d72c4ab093af17d48d1bc..d92749b3d98ec52053dab204134207ff210c4c6c 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -155,22 +155,16 @@ EOF
        $res = cgi_run("/test/blahblah\@example.com/raw");
        like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/,
                "mid raw hit");
-       $res = cgi_run("/test/blahblah\@example.con/raw");
-       like($res->{head}, qr/Status: 300 Multiple Choices/, "mid raw miss");
 
        $res = cgi_run("/test/blahblah\@example.com/");
        like($res->{body}, qr/\A<html>/, "mid html hit");
        like($res->{head}, qr/Status: 200 OK/, "200 response");
-       $res = cgi_run("/test/blahblah\@example.con/");
-       like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
 
        $res = cgi_run("/test/blahblah\@example.com/f/");
        like($res->{head}, qr/Status: 301 Moved/, "301 response");
        like($res->{head},
                qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms,
                '301 redirect location');
-       $res = cgi_run("/test/blahblah\@example.con/");
-       like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
 
        $res = cgi_run("/test/new.html");
        like($res->{body}, qr/slashy%2Fasdf\@example\.com/,
@@ -223,14 +217,15 @@ done_testing();
 
 sub run_with_env {
        my ($env, @args) = @_;
-       my $init = sub { foreach my $k (keys %$env) { $ENV{$k} = $env->{$k} } };
-       IPC::Run::run(@args, init => $init);
+       IPC::Run::run(@args, init => sub { %ENV = (%ENV, %$env) });
 }
 
 sub cgi_run {
        my %env = (
                PATH_INFO => $_[0],
                QUERY_STRING => $_[1] || "",
+               SCRIPT_NAME => '',
+               REQUEST_URI => $_[0] . ($_[1] ? "?$_[1]" : ''),
                REQUEST_METHOD => $_[2] || "GET",
                GATEWAY_INTERFACE => 'CGI/1.1',
                HTTP_ACCEPT => '*/*',