- remove borked tag again

[catagits/Catalyst-Runtime.git] / t / optional / http-server-restart.t

diff --git a/t/optional/http-server-restart.t b/t/optional/http-server-restart.t
index d8fa69f..93e9ea7 100644 (file)
--- a/t/optional/http-server-restart.t
+++ b/t/optional/http-server-restart.t
@@ -19,19 +19,22 @@ plan skip_all => 'File::Copy::Recursive required' if $@;
 plan tests => 40;\r
 \r
 # clean up\r
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";\r
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";\r
 \r
 # create a TestApp and copy the test libs into it\r
-mkdir "$FindBin::Bin/../../t/var";\r
-chdir "$FindBin::Bin/../../t/var";\r
-system "$FindBin::Bin/../../script/catalyst.pl TestApp";\r
+mkdir "$FindBin::Bin/../../t/tmp";\r
+chdir "$FindBin::Bin/../../t/tmp";\r
+system "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../script/catalyst.pl TestApp";\r
 chdir "$FindBin::Bin/../..";\r
-File::Copy::Recursive::dircopy( 't/live/lib', 't/var/TestApp/lib' );\r
+File::Copy::Recursive::dircopy( 't/live/lib', 't/tmp/TestApp/lib' );\r
+\r
+# remove TestApp's tests\r
+rmtree 't/tmp/TestApp/t';\r
 \r
 # spawn the standalone HTTP server\r
 my $port = 30000 + int rand(1 + 10000);\r
 my $pid = open my $server, \r
-    "$FindBin::Bin/../../t/var/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |"\r
+    "perl -I$FindBin::Bin/../../lib $FindBin::Bin/../../t/tmp/TestApp/script/testapp_server.pl -port $port -restart 2>&1 |"\r
     or die "Unable to spawn standalone HTTP server: $!";\r
 \r
 # wait for it to start\r
@@ -42,9 +45,9 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 \r
 # change various files\r
 my @files = (\r
-    "$FindBin::Bin/../../t/var/TestApp/lib/TestApp.pm",\r
-    "$FindBin::Bin/../../t/var/TestApp/lib/TestApp/Controller/Action/Begin.pm",\r
-    "$FindBin::Bin/../../t/var/TestApp/lib/TestApp/Controller/Engine/Request/URI.pm",\r
+    "$FindBin::Bin/../../t/tmp/TestApp/lib/TestApp.pm",\r
+    "$FindBin::Bin/../../t/tmp/TestApp/lib/TestApp/Controller/Action/Begin.pm",\r
+    "$FindBin::Bin/../../t/tmp/TestApp/lib/TestApp/Controller/Engine/Request/URI.pm",\r
 );\r
 \r
 # change some files and make sure the server restarts itself\r
@@ -64,7 +67,7 @@ for ( 1..20 ) {
         die "Server appears to have died" if $count++ > 50;\r
     }\r
     my $response = get("http://localhost:$port/action/default");\r
-    like( $response, qr/Catalyst::Request/, 'Request OK' );\r
+    like( $response, qr/Catalyst::Request/, 'Non-error restart, request OK' );\r
     \r
     #print $server->getline;\r
 }\r
@@ -83,17 +86,17 @@ for ( 1..20 ) {
         die "Server appears to have died";\r
     }\r
     my $response = get("http://localhost:$port/action/default");\r
-    like( $response, qr/Catalyst::Request/, 'Request OK' );\r
+    like( $response, qr/Catalyst::Request/, 'Syntax error, no restart, request OK' );\r
     \r
     #print $server->getline;\r
 }\r
 \r
 # shut it down\r
-kill 2, $pid;\r
+kill 'INT', $pid;\r
 close $server;\r
 \r
 # clean up\r
-rmtree "$FindBin::Bin/../../t/var" if -d "$FindBin::Bin/../../t/var";\r
+rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";\r
 \r
 sub check_port {\r
     my ( $host, $port ) = @_;\r