r12983@zaphod: kd | 2008-04-28 18:10:27 +1000

[catagits/Catalyst-Runtime.git] / t / optional_http-server.t

diff --git a/t/optional_http-server.t b/t/optional_http-server.t
index fbef97f..bf1878b 100644 (file)
--- a/t/optional_http-server.t
+++ b/t/optional_http-server.t
@@ -1,10 +1,9 @@
-#!perl
-
 use strict;
 use warnings;
 
 use File::Path;
 use FindBin;
+use IPC::Open3;
 use IO::Socket;
 use Test::More;
 
@@ -18,13 +17,15 @@ 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 "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
+rmtree $tmpdir if -d $tmpdir;
 
 # create a TestApp and copy the test libs into it
-mkdir "$FindBin::Bin/../t/tmp";
-chdir "$FindBin::Bin/../t/tmp";
-system "perl -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";
+mkdir $tmpdir;
+chdir $tmpdir;
+system( 'perl', "-I$FindBin::Bin/../lib", "$FindBin::Bin/../script/catalyst.pl", 'TestApp' );
 chdir "$FindBin::Bin/..";
 File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
 
@@ -33,8 +34,9 @@ rmtree 't/tmp/TestApp/t';
 
 # spawn the standalone HTTP server
 my $port = 30000 + int rand(1 + 10000);
-my $pid = open my $server, 
-    "perl -I$FindBin::Bin/../lib $FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl -port $port 2>&1 |"
+my $pid = open3( undef, my $server, undef,
+  'perl', "-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
@@ -46,11 +48,12 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 # run the testsuite against the HTTP server
 $ENV{CATALYST_SERVER} = "http://localhost:$port";
 
+my $return;
 if ( $single_test ) {
-    system( "perl -Ilib/ $single_test" );
+    $return = system( "perl -Ilib/ $single_test" );
 }
 else {
-    system( 'prove -r -Ilib/ t/live_*' );
+    $return = system( 'prove -r -Ilib/ t/live_*.t' );
 }
 
 # shut it down
@@ -60,7 +63,7 @@ close $server;
 # clean up
 rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 
-ok( 'done' );
+is( $return, 0, 'live tests' );
 
 sub check_port {
     my ( $host, $port ) = @_;