[Catalyst-commits] r12640 - in Catalyst-Runtime/5.80/branches/psgi: . t t/lib

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-01-14 05:46:59 +0000 (Thu, 14 Jan 2010)
New Revision: 12640

Modified:
   Catalyst-Runtime/5.80/branches/psgi/TODO
   Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp.pm
   Catalyst-Runtime/5.80/branches/psgi/t/live_component_controller_context_closure.t
Log:
Merge branch 'master' into psgi

* master:
  Only set up the leakchecker for the tests that need it.
  Exception stuff is fixed for a while now.

Modified: Catalyst-Runtime/5.80/branches/psgi/TODO
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/TODO	2010-01-14 05:45:09 UTC (rev 12639)
+++ Catalyst-Runtime/5.80/branches/psgi/TODO	2010-01-14 05:46:59 UTC (rev 12640)
@@ -5,12 +5,6 @@
 
      Test app: http://github.com/bobtfish/catalyst-app-bug-go_chain/tree/master
 
-   - Bricas' Exception blog post
-
-     http://bricas.vox.com/library/post/catalyst-exceptionclass.html
-
-     Broken by recent exception refactoring
-
 # Compatibility warnings to add:
 
   - $self->config should warn as config should only ever be called as a

Modified: Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp.pm	2010-01-14 05:45:09 UTC (rev 12639)
+++ Catalyst-Runtime/5.80/branches/psgi/t/lib/TestApp.pm	2010-01-14 05:46:59 UTC (rev 12640)
@@ -20,7 +20,7 @@
 
 TestApp->config( name => 'TestApp', root => '/some/dir' );
 
-if (eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
+if ($::setup_leakchecker && eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
     with 'CatalystX::LeakChecker';
 
     has leaks => (

Modified: Catalyst-Runtime/5.80/branches/psgi/t/live_component_controller_context_closure.t
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/t/live_component_controller_context_closure.t	2010-01-14 05:45:09 UTC (rev 12639)
+++ Catalyst-Runtime/5.80/branches/psgi/t/live_component_controller_context_closure.t	2010-01-14 05:46:59 UTC (rev 12640)
@@ -13,6 +13,8 @@
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
+BEGIN { $::setup_leakchecker = 1 }
+
 use Catalyst::Test 'TestApp';
 
 {