[Catalyst-commits] r11280 - in Catalyst-Runtime/5.80/trunk/t: .
aggregate author lib
t0m at dev.catalyst.perl.org
t0m at dev.catalyst.perl.org
Tue Sep 1 01:10:47 GMT 2009
Author: t0m
Date: 2009-09-01 01:10:46 +0000 (Tue, 01 Sep 2009)
New Revision: 11280
Added:
Catalyst-Runtime/5.80/trunk/t/author/
Catalyst-Runtime/5.80/trunk/t/author/optional_http-server.t
Removed:
Catalyst-Runtime/5.80/trunk/t/optional_http-server.t
Modified:
Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_index_or_default.t
Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t
Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_regexp.t
Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_view_single.t
Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_request_remote_user.t
Catalyst-Runtime/5.80/trunk/t/lib/TestApp.pm
Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t
Catalyst-Runtime/5.80/trunk/t/unit_core_classdata.t
Log:
Stop remote tests breaking everything, and force authors to run some remote tests.
Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_index_or_default.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_index_or_default.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_index_or_default.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -10,10 +10,13 @@
BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
-use Test::More tests => 6*$iters;
-
+use Test::More;
use Catalyst::Test 'TestAppIndexDefault';
+plan 'skip_all' if ( $ENV{CATALYST_SERVER} );
+
+plan tests => 6*$iters;
+
if ( $ENV{CAT_BENCHMARK} ) {
require Benchmark;
Benchmark::timethis( $iters, \&run_tests );
Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_path_matchsingle.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -10,9 +10,13 @@
BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
-use Test::More tests => 3*$iters;
+use Test::More;
use Catalyst::Test 'TestAppMatchSingleArg';
+plan 'skip_all' if ( $ENV{CATALYST_SERVER} );
+
+plan tests => 3*$iters;
+
if ( $ENV{CAT_BENCHMARK} ) {
require Benchmark;
Benchmark::timethis( $iters, \&run_tests );
Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_regexp.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_regexp.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_controller_action_regexp.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -131,8 +131,10 @@
'TestApp::Controller::Action::Regexp',
'Test Class'
);
+ my $location = $response->header('location');
+ $location =~ s/localhost(:\d+)?/localhost/;
is(
- $response->header('location'),
+ $location,
$url,
'Redirect URI is the same as the request URI'
);
Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_view_single.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_view_single.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_component_view_single.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -10,9 +10,13 @@
BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 1; }
-use Test::More tests => 3*$iters;
+use Test::More;
use Catalyst::Test 'TestAppOneView';
+plan 'skip_all' if ( $ENV{CATALYST_SERVER} );
+
+plan tests => 3*$iters;
+
if ( $ENV{CAT_BENCHMARK} ) {
require Benchmark;
Benchmark::timethis( $iters, \&run_tests );
Modified: Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_request_remote_user.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_request_remote_user.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/aggregate/live_engine_request_remote_user.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -37,6 +37,11 @@
}
isa_ok( $creq, 'Catalyst::Request' );
-
- is( $creq->remote_user, 'dwc', '$c->req->remote_user ok' );
+ SKIP:
+ {
+ if ( $ENV{CATALYST_SERVER} ) {
+ skip 'Using remote server', 1;
+ }
+ is( $creq->remote_user, 'dwc', '$c->req->remote_user ok' );
+ }
}
Copied: Catalyst-Runtime/5.80/trunk/t/author/optional_http-server.t (from rev 11261, Catalyst-Runtime/5.80/trunk/t/optional_http-server.t)
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/author/optional_http-server.t (rev 0)
+++ Catalyst-Runtime/5.80/trunk/t/author/optional_http-server.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -0,0 +1,96 @@
+use strict;
+use warnings;
+
+use Test::More tests => 1;
+
+use File::Path;
+use FindBin;
+use IPC::Open3;
+use IO::Socket;
+
+use Catalyst::Devel 1.0;
+use File::Copy::Recursive;
+
+# Run a single test by providing it as the first arg
+my $single_test = shift;
+
+my $tmpdir = "$FindBin::Bin/../../t/tmp";
+
+# clean up
+rmtree $tmpdir if -d $tmpdir;
+
+# create a TestApp and copy the test libs into it
+mkdir $tmpdir;
+chdir $tmpdir;
+system( $^X, "-I$FindBin::Bin/../../lib", "$FindBin::Bin/../../script/catalyst.pl", 'TestApp' );
+chdir "$FindBin::Bin/..";
+File::Copy::Recursive::dircopy( '../t/lib', '../t/tmp/TestApp/lib' ) or die;
+
+# remove TestApp's tests
+rmtree '../t/tmp/TestApp/t' or die;
+
+# spawn the standalone HTTP server
+my $port = 30000 + int rand(1 + 10000);
+my @cmd = ($^X, "-I$FindBin::Bin/../../lib",
+ "$FindBin::Bin/../../t/tmp/TestApp/script/testapp_server.pl", '-port', $port );
+my $pid = open3( undef, my $server, undef, @cmd)
+ or die "Unable to spawn standalone HTTP server: $!";
+
+# wait for it to start
+print "Waiting for server to start...\n";
+my $timeout = 30;
+my $count = 0;
+while ( check_port( 'localhost', $port ) != 1 ) {
+ sleep 1;
+ die("Server did not start within $timeout seconds: " . join(' ', @cmd))
+ if $count++ > $timeout;
+}
+
+# run the testsuite against the HTTP server
+$ENV{CATALYST_SERVER} = "http://localhost:$port";
+
+my $return;
+if ( $single_test ) {
+ $return = system( "$^X -I../lib/ $single_test" );
+}
+else {
+ $return = prove( '-r', '-I../lib/', glob('../t/aggregate/live_*.t') );
+}
+
+# shut it down
+kill 'INT', $pid;
+close $server;
+
+# clean up
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";
+
+is( $return, 0, 'live tests' );
+
+sub check_port {
+ my ( $host, $port ) = @_;
+
+ my $remote = IO::Socket::INET->new(
+ Proto => "tcp",
+ PeerAddr => $host,
+ PeerPort => $port
+ );
+ if ($remote) {
+ close $remote;
+ return 1;
+ }
+ else {
+ return 0;
+ }
+}
+
+sub prove {
+ if (!(my $pid = fork)) {
+ require App::Prove;
+ my $prove = App::Prove->new;
+ $prove->process_args(@_);
+ exit( $prove->run ? 0 : 1 );
+ } else {
+ waitpid $pid, 0;
+ return $?;
+ }
+}
Modified: Catalyst-Runtime/5.80/trunk/t/lib/TestApp.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/lib/TestApp.pm 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/lib/TestApp.pm 2009-09-01 01:10:46 UTC (rev 11280)
@@ -77,7 +77,7 @@
@executed
);
}
-
+ no warnings 'recursion';
return $c->SUPER::execute(@_);
}
@@ -107,6 +107,7 @@
sub recursion_test : Local {
my ( $self, $c ) = @_;
+ no warnings 'recursion';
$c->forward( 'recursion_test' );
}
Modified: Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/optional_http-server-restart.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -45,10 +45,11 @@
my $port = 30000 + int rand( 1 + 10000 );
my( $server, $pid );
-$pid = open3( undef, $server, undef,
- $^X, "-I$FindBin::Bin/../lib",
+my @cmd = ($^X, "-I$FindBin::Bin/../lib", "-I$FindBin::Bin/lib",
"$FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl", '-port',
- $port, '-restart' )
+ $port, '-restart');
+
+$pid = open3( undef, $server, undef, @cmd )
or die "Unable to spawn standalone HTTP server: $!";
# switch to non-blocking reads so we can fail
@@ -67,11 +68,9 @@
"$FindBin::Bin/../t/tmp/TestApp/lib/TestApp.pm",
"$FindBin::Bin/../t/tmp/TestApp/lib/TestApp/Controller/Action/Begin.pm",
"$FindBin::Bin/../t/tmp/TestApp/lib/TestApp/Controller/Immutable.pm",
+ "$FindBin::Bin/../t/tmp/TestApp/lib/TestApp/Controller/Immutable/HardToReload.pm",
);
-push(@files, "$FindBin::Bin/../t/tmp/TestApp/lib/TestApp/Controller/Immutable/HardToReload.pm")
- if Catalyst::Engine::HTTP::Restarter::Watcher::DETECT_PACKAGE_COMPILATION();
-
# change some files and make sure the server restarts itself
NON_ERROR_RESTART:
for ( 1 .. 20 ) {
@@ -84,7 +83,6 @@
# give the server time to notice the change and restart
my $count = 0;
my $line;
-
while ( ( $line || '' ) !~ /can connect/ ) {
# wait for restart message
$line = $server->getline;
Deleted: Catalyst-Runtime/5.80/trunk/t/optional_http-server.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/optional_http-server.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/optional_http-server.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -1,98 +0,0 @@
-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;
-
-eval "use Catalyst::Devel 1.0";
-plan skip_all => 'Catalyst::Devel required' if $@;
-eval "use File::Copy::Recursive";
-plan skip_all => 'File::Copy::Recursive required' if $@;
-plan tests => 1;
-
-# Run a single test by providing it as the first arg
-my $single_test = shift;
-
-my $tmpdir = "$FindBin::Bin/../t/tmp";
-
-# clean up
-rmtree $tmpdir if -d $tmpdir;
-
-# create a TestApp and copy the test libs into it
-mkdir $tmpdir;
-chdir $tmpdir;
-system( $^X, "-I$FindBin::Bin/../lib", "$FindBin::Bin/../script/catalyst.pl", 'TestApp' );
-chdir "$FindBin::Bin/..";
-File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
-
-# remove TestApp's tests
-rmtree 't/tmp/TestApp/t';
-
-# spawn the standalone HTTP server
-my $port = 30000 + int rand(1 + 10000);
-my $pid = open3( undef, my $server, undef,
- $^X, "-I$FindBin::Bin/../lib",
- "$FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl", '-port', $port )
- or die "Unable to spawn standalone HTTP server: $!";
-
-# wait for it to start
-print "Waiting for server to start...\n";
-while ( check_port( 'localhost', $port ) != 1 ) {
- sleep 1;
-}
-
-# run the testsuite against the HTTP server
-$ENV{CATALYST_SERVER} = "http://localhost:$port";
-
-my $return;
-if ( $single_test ) {
- $return = system( "$^X -Ilib/ $single_test" );
-}
-else {
- $return = prove( '-r', '-Ilib/', glob('t/aggregate/live_*.t') );
-}
-
-# shut it down
-kill 'INT', $pid;
-close $server;
-
-# clean up
-rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
-
-is( $return, 0, 'live tests' );
-
-sub check_port {
- my ( $host, $port ) = @_;
-
- my $remote = IO::Socket::INET->new(
- Proto => "tcp",
- PeerAddr => $host,
- PeerPort => $port
- );
- if ($remote) {
- close $remote;
- return 1;
- }
- else {
- return 0;
- }
-}
-
-sub prove {
- if (!(my $pid = fork)) {
- require App::Prove;
- my $prove = App::Prove->new;
- $prove->process_args(@_);
- exit( $prove->run ? 0 : 1 );
- } else {
- waitpid $pid, 0;
- return $?;
- }
-}
Modified: Catalyst-Runtime/5.80/trunk/t/unit_core_classdata.t
===================================================================
--- Catalyst-Runtime/5.80/trunk/t/unit_core_classdata.t 2009-09-01 01:09:29 UTC (rev 11279)
+++ Catalyst-Runtime/5.80/trunk/t/unit_core_classdata.t 2009-09-01 01:10:46 UTC (rev 11280)
@@ -100,3 +100,7 @@
is(refaddr(ClassDataTest->_scalarref), refaddr($scalarref3));
is(refaddr(ClassDataTest->_coderef), refaddr($coderef3));
is(ClassDataTest->_scalar, $scalar3);
+
+my $i = bless {}, 'ClassDataTest';
+$i->_scalar('foo');
+
More information about the Catalyst-commits
mailing list