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=6e3f9d973268bf6e117dcb0a5d775de61e22c418;hp=6763b1416b8dc6eefdb96db3b86c2548d260b6a0;hpb=220bf857ab697651a59738aa34c9e110f6af486a;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/aggregate/live_engine_request_env.t b/t/aggregate/live_engine_request_env.t
index 6763b14..30066a4 100644
--- a/t/aggregate/live_engine_request_env.t
+++ b/t/aggregate/live_engine_request_env.t
@@ -12,18 +12,20 @@ use vars qw/
 /;
 
 BEGIN {
-    $EXPECTED_ENV_VAR = "CatalystTest$$";
+    $EXPECTED_ENV_VAR = "CATALYSTTEST$$"; # has to be uppercase otherwise fails on Win32 
     $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;
 
@@ -31,8 +33,8 @@ use HTTP::Request::Common;
         'Request' );
     ok( $response->is_success, 'Response Successful 2xx' );
     is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    ok( eval '$env = TestApp->engine->env', 'engine->env is defined' );
-    is( ref($env), 'HASH', 'engine->env is a hash' );
+    ok( eval '$env = ' . $response->content, 'Unserialize Catalyst::Request' );
+    is ref($env), 'HASH';
     ok exists($env->{PATH}), 'Have a PATH env var';
 
     SKIP:
@@ -45,3 +47,5 @@ use HTTP::Request::Common;
     }
 }
 
+done_testing;
+