X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faggregate%2Flive_engine_request_env.t;h=30066a40868cf2418788baa3eb7617c20e0dfc6d;hb=5240c813b68a797240349df34c74a9abd13ae6e1;hp=571ee68297952ae4c964c28f768b712f5753e226;hpb=2f0a543651c2824d911b5471dbc774014f4c5ee3;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t
index 571ee68..30066a4 100644
--- a/t/aggregate/live_engine_request_env.t
+++ b/t/aggregate/live_engine_request_env.t
@@ -13,29 +13,29 @@ use vars qw/
 
 BEGIN {
     $EXPECTED_ENV_VAR = "CATALYSTTEST$$"; # has to be uppercase otherwise fails on Win32 
-    $EXPECTED_ENV_VAL = "Test env value " . rand(100000);
+    $EXPECTED_ENV_VAL = $ENV{$EXPECTED_ENV_VAR}
+         = "Test env value " . rand(100000);
 }
 
-use Test::More tests => 7;
+use Test::More;
 use Catalyst::Test 'TestApp';
 
 use Catalyst::Request;
 use HTTP::Headers;
 use HTTP::Request::Common;
 
+plan skip_all => 'Does not work in live tests' if ( $ENV{CATALYST_SERVER} );
+
 {
     my $env;
 
-    my $response = request("http://localhost/dump/env", {
-        extra_env => { $EXPECTED_ENV_VAR => $EXPECTED_ENV_VAL },
-    });
-
-    ok( $response, 'Request' );
+    ok( my $response = request("http://localhost/dump/env"),
+        'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
     ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' );
     is ref($env), 'HASH';
-    ok exists($env->{PATH_INFO}), 'Have a PATH_INFO env var';
+    ok exists($env->{PATH}), 'Have a PATH env var';
 
     SKIP:
     {
@@ -47,3 +47,5 @@ use HTTP::Request::Common;
     }
 }
 
+done_testing;
+