[Catalyst-commits] r11103 - in trunk/Catalyst-Plugin-ConfigLoader: . t

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2009-08-10 11:32:56 +0000 (Mon, 10 Aug 2009)
New Revision: 11103

Modified:
   trunk/Catalyst-Plugin-ConfigLoader/Changes
   trunk/Catalyst-Plugin-ConfigLoader/t/20-mock_load.t
   trunk/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t
Log:
do not localize %ENV, rather, remove potentially conflicting k-v pairs (RT #48557)

Modified: trunk/Catalyst-Plugin-ConfigLoader/Changes
===================================================================
--- trunk/Catalyst-Plugin-ConfigLoader/Changes	2009-08-10 11:14:59 UTC (rev 11102)
+++ trunk/Catalyst-Plugin-ConfigLoader/Changes	2009-08-10 11:32:56 UTC (rev 11103)
@@ -2,6 +2,8 @@
 
 0.26  XXX
     - Fix test to not need "parent" (RT #48547)
+    - Do not localize %ENV, rather, remove potentially conflicting
+      k-v pairs (RT #48557)
 
 0.25  Fri Aug 07 2009
     - Fix get_config_local_suffix and get_config_path when finding values 

Modified: trunk/Catalyst-Plugin-ConfigLoader/t/20-mock_load.t
===================================================================
--- trunk/Catalyst-Plugin-ConfigLoader/t/20-mock_load.t	2009-08-10 11:14:59 UTC (rev 11102)
+++ trunk/Catalyst-Plugin-ConfigLoader/t/20-mock_load.t	2009-08-10 11:32:56 UTC (rev 11103)
@@ -1,9 +1,13 @@
 package MockApp;
 
 use Test::More tests => 10;
+use Cwd;
 
-use Cwd;
-local %ENV;
+# Remove all relevant env variables to avoid accidental fail
+foreach my $name ( grep { m{^(CATALYST)} } keys %ENV ) {
+    delete $ENV{ $name };
+}
+
 $ENV{ CATALYST_HOME } = cwd . '/t/mockapp';
 
 use_ok( 'Catalyst', qw( ConfigLoader ) );

Modified: trunk/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t
===================================================================
--- trunk/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t	2009-08-10 11:14:59 UTC (rev 11102)
+++ trunk/Catalyst-Plugin-ConfigLoader/t/21-mock_load_env.t	2009-08-10 11:32:56 UTC (rev 11103)
@@ -1,9 +1,13 @@
 package MockApp;
 
 use Test::More tests => 10;
+use Cwd;
 
-use Cwd;
-local %ENV;
+# Remove all relevant env variables to avoid accidental fail
+foreach my $name ( grep { m{^(CATALYST|MOCKAPP)} } keys %ENV ) {
+    delete $ENV{ $name };
+} 
+
 $ENV{ CATALYST_HOME }  = cwd . '/t/mockapp';
 $ENV{ MOCKAPP_CONFIG } = $ENV{ CATALYST_HOME } . '/mockapp.pl';