X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_http-server-restart.t;h=ff7049d17e7d13c24dee4a8aec53db28c1ad0cb7;hp=c3bff4fa94e56592840fb2e1529ed50ce58d1b24;hb=eebd1520470f767fdefdc03c1fe05427e5f182f9;hpb=7d9921b1634786926b83a7c9de0dafc69ad506d7

diff --git a/t/optional_http-server-restart.t b/t/optional_http-server-restart.t
index c3bff4f..ff7049d 100644
--- a/t/optional_http-server-restart.t
+++ b/t/optional_http-server-restart.t
@@ -14,40 +14,26 @@ use LWP::Simple;
 use IO::Socket;
 use IPC::Open3;
 use Time::HiRes qw/sleep/;
-eval "use Catalyst::Devel 1.0;";
 
-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";
-plan skip_all => 'File::Copy::Recursive required' if $@;
-
-plan tests => 120;
-
-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' );
+BEGIN {
+    eval "use File::Copy::Recursive";
+    plan skip_all => 'File::Copy::Recursive required' if $@;
+}
 
-chdir "$FindBin::Bin/..";
-File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
+use lib 't/lib';
+use MakeTestApp;
 
-# remove TestApp's tests
-rmtree 't/tmp/TestApp/t';
+make_test_app;
 
 # spawn the standalone HTTP server
 my $port = 30000 + int rand( 1 + 10000 );
 
 my( $server, $pid );
-$pid = open3( undef, $server, undef,
-  $^X, "-I$FindBin::Bin/../lib",
-  "$FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl", '-port',
-  $port, '-restart' )
+my @cmd = ($^X, "-I$FindBin::Bin/../lib", "-I$FindBin::Bin/lib",
+  "$FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl", '--port',
+  $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
@@ -66,6 +52,7 @@ my @files = (
     "$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",
 );
 
 # change some files and make sure the server restarts itself
@@ -80,8 +67,7 @@ for ( 1 .. 20 ) {
     # give the server time to notice the change and restart
     my $count = 0;
     my $line;
-
-    while ( ( $line || '' ) !~ /can connect/ ) {
+    while ( ( $line || '' ) !~ /ttempting to restart the server/ ) {
         # wait for restart message
         $line = $server->getline;
         sleep 0.1;
@@ -108,45 +94,6 @@ for ( 1 .. 20 ) {
     sleep 1;
 }
 
-# add errors to the file and make sure server does not die or restart
-NO_RESTART_ON_ERROR:
-for ( 1 .. 20 ) {
-    my $index = rand @files;
-    open my $pm, '>>', $files[$index]
-      or die "Unable to open $files[$index] for writing: $!";
-    print $pm "bleh";
-    close $pm;
-
-    my $count = 0;
-    my $line;
-
-    while ( ( $line || '' ) !~ /failed/ ) {
-        # wait for restart message
-        $line = $server->getline;
-        sleep 0.1;
-        if ( $count++ > 100 ) {
-            fail "Server restarted";
-            SKIP: {
-                skip "Server didn't restart, no sense in checking response", 1;
-            }
-            next NO_RESTART_ON_ERROR;
-        }
-    };
-
-    pass "Server refused to restart";
-
-    if ( check_port( 'localhost', $port ) != 1 ) {
-        die "Server appears to have died";
-    }
-    my $response = get("http://localhost:$port/action/default");
-    like( $response, qr/Catalyst::Request/,
-        'Syntax error, no restart, request OK' );
-
-    # give the server some time to reindex its files
-    sleep 1;
-
-}
-
 # multiple restart directories
 
 # we need different options so we have to rebuild most
@@ -155,87 +102,11 @@ for ( 1 .. 20 ) {
 kill 'KILL', $pid;
 close $server;
 
-# pick next port because the last one might still be blocked from
-# previous server. This might fail if this port is unavailable
-# but picking the first one has the same problem so this is acceptable
-
-$port += 1;
-
-{ no warnings 'once'; $File::Copy::Recursive::RMTrgFil = 1; }
-File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
-
-# change various files
-@files = (
-  "$FindBin::Bin/../t/tmp/TestApp/lib/TestApp/Controller/Action/Begin.pm",
-  "$FindBin::Bin/../t/tmp/TestApp/lib/TestApp/Controller/Engine/Request/URI.pm",
-);
-
-my $app_root = "$FindBin::Bin/../t/tmp/TestApp";
-my $restartdirs = join ' ', map{
-    "-restartdirectory $app_root/lib/TestApp/Controller/$_"
-} qw/Action Engine/;
-
-$pid = open3( undef, $server, undef,
-  $^X, "-I$FindBin::Bin/../lib",
-  "$FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl", '-port',
-  $port, '-restart', $restartdirs )
-    or die "Unable to spawn standalone HTTP server: $!";
-$server->blocking( 0 );
-
-
-# wait for it to start
-print "Waiting for server to start...\n";
-while ( check_port( 'localhost', $port ) != 1 ) {
-    sleep 1;
-}
-
-MULTI_DIR_RESTART:
-for ( 1 .. 20 ) {
-    my $index = rand @files;
-    open my $pm, '>>', $files[$index]
-      or die "Unable to open $files[$index] for writing: $!";
-    print $pm "\n";
-    close $pm;
-
-    # 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;
-        sleep 0.1;
-        if ( $count++ > 100 ) {
-            fail "Server restarted";
-            SKIP: {
-                skip "Server didn't restart, no sense in checking response", 1;
-            }
-            next MULTI_DIR_RESTART;
-        }
-    };
-    pass "Server restarted with multiple restartdirs";
-
-    $count = 0;
-    while ( check_port( 'localhost', $port ) != 1 ) {
-        # wait for it to restart
-        sleep 0.1;
-        die "Server appears to have died" if $count++ > 100;
-    }
-    my $response = get("http://localhost:$port/action/default");
-    like( $response, qr/Catalyst::Request/, 'Non-error restart, request OK' );
-
-    # give the server some time to reindex its files
-    sleep 1;
-}
-
-# shut it down again
-
-kill 'KILL', $pid;
-close $server;
-
 # clean up
 rmtree "$FindBin::Bin/../t/tmp" if -d "$FindBin::Bin/../t/tmp";
 
+done_testing;
+
 sub check_port {
     my ( $host, $port ) = @_;