[Catalyst-commits] r9040 - Catalyst-Runtime/5.80/trunk/t

rafl at dev.catalyst.perl.org rafl at dev.catalyst.perl.org
Thu Jan 8 12:06:50 GMT 2009


Author: rafl
Date: 2009-01-08 12:06:50 +0000 (Thu, 08 Jan 2009)
New Revision: 9040

Modified:
   Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t
   Catalyst-Runtime/5.80/trunk/t/optional_http-server.t
   Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t
   Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t
   Catalyst-Runtime/5.80/trunk/t/optional_memleak.t
   Catalyst-Runtime/5.80/trunk/t/optional_stress.t
   Catalyst-Runtime/5.80/trunk/t/optional_threads.t
Log:
Make the optional tests bail out as early as possible if they're not enabled.

Modified: Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -3,16 +3,19 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
+}
+
 use File::Path;
 use FindBin;
 use LWP::Simple;
 use IO::Socket;
 use IPC::Open3;
-use Test::More;
 use Time::HiRes qw/sleep/;
 eval "use Catalyst::Devel 1.0;";
 
-plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
 plan skip_all => 'Catalyst::Devel required' if $@;
 plan skip_all => 'Catalyst::Devel >= 1.04 required' if $Catalyst::Devel::VERSION <= 1.03;
 eval "use File::Copy::Recursive";

Modified: Catalyst-Runtime/5.80/trunk/t/optional_http-server.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_http-server.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_http-server.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -1,13 +1,16 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
+}
+
 use File::Path;
 use FindBin;
 use IPC::Open3;
 use IO::Socket;
-use Test::More;
 
-plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
 eval "use Catalyst::Devel 1.0";
 plan skip_all => 'Catalyst::Devel required' if $@;
 eval "use File::Copy::Recursive";

Modified: Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi-non-root.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -3,14 +3,16 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_LIGHTTPD to enable this test'
+        unless $ENV{TEST_LIGHTTPD};
+}
+
 use File::Path;
 use FindBin;
 use IO::Socket;
-use Test::More;
 
-plan skip_all => 'set TEST_LIGHTTPD to enable this test' 
-    unless $ENV{TEST_LIGHTTPD};
-    
 eval "use FCGI";
 plan skip_all => 'FCGI required' if $@;
 

Modified: Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_lighttpd-fastcgi.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -3,14 +3,16 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_LIGHTTPD to enable this test'
+        unless $ENV{TEST_LIGHTTPD};
+}
+
 use File::Path;
 use FindBin;
 use IO::Socket;
-use Test::More;
 
-plan skip_all => 'set TEST_LIGHTTPD to enable this test' 
-    unless $ENV{TEST_LIGHTTPD};
-    
 eval "use FCGI";
 plan skip_all => 'FCGI required' if $@;
 

Modified: Catalyst-Runtime/5.80/trunk/t/optional_memleak.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_memleak.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_memleak.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -3,15 +3,16 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_MEMLEAK to enable this test'
+        unless $ENV{TEST_MEMLEAK};
+}
+
 use FindBin;
 use lib "$FindBin::Bin/lib";
-
-use Test::More;
 use Catalyst::Test 'TestApp';
 
-plan skip_all => 'set TEST_MEMLEAK to enable this test'
-    unless $ENV{TEST_MEMLEAK};
-
 eval "use Proc::ProcessTable";
 plan skip_all => 'Proc::ProcessTable required for this test' if $@;
 

Modified: Catalyst-Runtime/5.80/trunk/t/optional_stress.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_stress.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_stress.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -3,18 +3,19 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_STRESS to enable this test'
+      unless $ENV{TEST_STRESS};
+}
+
 use FindBin;
 use lib "$FindBin::Bin/lib";
-
-use Test::More;
 use Catalyst::Test 'TestApp';
 
 our ( $iters, $tests );
 
 BEGIN {
-    plan skip_all => 'set TEST_STRESS to enable this test'
-      unless $ENV{TEST_STRESS};
-
     eval "use YAML";
     plan skip_all => 'YAML is required for this test' if $@;
 

Modified: Catalyst-Runtime/5.80/trunk/t/optional_threads.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_threads.t	2009-01-08 11:56:56 UTC (rev 9039)
+++ Catalyst-Runtime/5.80/trunk/t/optional_threads.t	2009-01-08 12:06:50 UTC (rev 9040)
@@ -3,18 +3,19 @@
 use strict;
 use warnings;
 
+use Test::More;
+BEGIN {
+    plan skip_all => 'set TEST_THREADS to enable this test'
+        unless $ENV{TEST_THREADS};
+}
+
 use FindBin;
 use lib "$FindBin::Bin/lib";
-
-use Test::More;
 use Catalyst::Test 'TestApp';
 use Catalyst::Request;
 use Config;
 use HTTP::Response;
 
-plan skip_all => 'set TEST_THREADS to enable this test'
-    unless $ENV{TEST_THREADS};
-
 if ( $Config{useithreads} && !$ENV{CATALYST_SERVER} ) {
     require threads;
     plan tests => 3;




More information about the Catalyst-commits mailing list