Updated tests

diff --git a/t/optional_http-server-restart.t b/t/optional_http-server-restart.t
index 93e9ea7..b20944c 100644 (file)
--- a/t/optional_http-server-restart.t
+++ b/t/optional_http-server-restart.t
@@ -19,23 +19,24 @@ plan skip_all => 'File::Copy::Recursive required' if $@;
 plan tests => 40;\r
 \r
 # clean up\r
-rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";\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/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/tmp/TestApp/lib' );\r
+mkdir "$FindBin::Bin/../t/tmp";\r
+chdir "$FindBin::Bin/../t/tmp";\r
+system\r
+  "perl -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";\r
+chdir "$FindBin::Bin/..";\r
+File::Copy::Recursive::dircopy( 't/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
-    "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
+my $port = 30000 + int rand( 1 + 10000 );\r
+my $pid  = open my $server,\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
 print "Waiting for server to start...\n";\r
@@ -45,49 +46,51 @@ while ( check_port( 'localhost', $port ) != 1 ) {
 \r
 # change various files\r
 my @files = (\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
+    "$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
-for ( 1..20 ) {\r
+for ( 1 .. 20 ) {\r
     my $index = rand @files;\r
     open my $pm, '>>', $files[$index]\r
-        or die "Unable to open $files[$index] for writing: $!";\r
+      or die "Unable to open $files[$index] for writing: $!";\r
     print $pm "\n";\r
     close $pm;\r
-    \r
+\r
     # give the server time to notice the change and restart\r
     my $count = 0;\r
     sleep 1;\r
     while ( check_port( 'localhost', $port ) != 1 ) {\r
+\r
         # wait for it to restart\r
         sleep 0.1;\r
         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/, 'Non-error restart, request OK' );\r
-    \r
+\r
     #print $server->getline;\r
 }\r
 \r
 # add errors to the file and make sure server does not die or restart\r
-for ( 1..20 ) {\r
+for ( 1 .. 20 ) {\r
     my $index = rand @files;\r
     open my $pm, '>>', $files[$index]\r
-        or die "Unable to open $files[$index] for writing: $!";\r
+      or die "Unable to open $files[$index] for writing: $!";\r
     print $pm "bleh";\r
     close $pm;\r
-    \r
+\r
     # give the server time to notice the change\r
     sleep 1;\r
     if ( check_port( 'localhost', $port ) != 1 ) {\r
         die "Server appears to have died";\r
     }\r
     my $response = get("http://localhost:$port/action/default");\r
-    like( $response, qr/Catalyst::Request/, 'Syntax error, no restart, request OK' );\r
-    \r
+    like( $response, qr/Catalyst::Request/,\r
+        'Syntax error, no restart, request OK' );\r
+\r
     #print $server->getline;\r
 }\r
 \r
@@ -96,7 +99,7 @@ kill 'INT', $pid;
 close $server;\r
 \r
 # clean up\r
-rmtree "$FindBin::Bin/../../t/tmp" if -d "$FindBin::Bin/../../t/tmp";\r
+rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";\r
 \r
 sub check_port {\r
     my ( $host, $port ) = @_;\r

diff --git a/t/optional_http-server.t b/t/optional_http-server.t
index d03a107..8219f3f 100644 (file)
--- a/t/optional_http-server.t
+++ b/t/optional_http-server.t
@@ -20,7 +20,7 @@ rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 mkdir "$FindBin::Bin/../t/tmp";
 chdir "$FindBin::Bin/../t/tmp";
 system "perl -I$FindBin::Bin/../lib $FindBin::Bin/../script/catalyst.pl TestApp";
-chdir "$FindBin::Bin/../..";
+chdir "$FindBin::Bin/..";
 File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
 
 # remove TestApp's tests