X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_http-server-restart.t;h=1e163ba6652a711b1276403e6b79db0645b4cb8e;hb=610bc6eccd3d749c9e14422575c3b8787f48fcf1;hp=7193a536fabbcb32c2e5cb5ae2af18edb4d7ce66;hpb=c7ded7aaf69e506924a5406349fd665c7717acb8;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/optional_http-server-restart.t b/t/optional_http-server-restart.t
index 7193a53..1e163ba 100644
--- a/t/optional_http-server-restart.t
+++ b/t/optional_http-server-restart.t
@@ -1,5 +1,3 @@
-#!perl
-
 # This test tests the standalone server's auto-restart feature.
 
 use strict;
@@ -9,25 +7,30 @@ use File::Path;
 use FindBin;
 use LWP::Simple;
 use IO::Socket;
+use IPC::Open3;
 use Test::More;
 use Time::HiRes qw/sleep/;
 eval "use Catalyst::Devel 1.0;";
 
 plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
 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 => 40;
+plan tests => 120;
+
+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( $^X, "-I$FindBin::Bin/../lib", "$FindBin::Bin/../script/catalyst.pl", 'TestApp' );
+
 chdir "$FindBin::Bin/..";
 File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
 
@@ -36,9 +39,18 @@ 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 -restart 2>&1 |"
-  or die "Unable to spawn standalone HTTP server: $!";
+
+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' )
+    or die "Unable to spawn standalone HTTP server: $!";
+
+# switch to non-blocking reads so we can fail
+# gracefully instead of just hanging forever
+
+$server->blocking( 0 );
 
 # wait for it to start
 print "Waiting for server to start...\n";
@@ -54,6 +66,7 @@ my @files = (
 );
 
 # change some files and make sure the server restarts itself
+NON_ERROR_RESTART:
 for ( 1 .. 20 ) {
     my $index = rand @files;
     open my $pm, '>>', $files[$index]
@@ -63,20 +76,37 @@ for ( 1 .. 20 ) {
 
     # give the server time to notice the change and restart
     my $count = 0;
-    sleep 1;
-    while ( check_port( 'localhost', $port ) != 1 ) {
+    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 NON_ERROR_RESTART;
+        }
+    };
+    pass "Server restarted";
+
+    $count = 0;
+    while ( check_port( 'localhost', $port ) != 1 ) {
         # wait for it to restart
         sleep 0.1;
-        die "Server appears to have died" if $count++ > 50;
+        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' );
 
-    #print $server->getline;
+    # give the server some time to reindex its files
+    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]
@@ -84,8 +114,24 @@ for ( 1 .. 20 ) {
     print $pm "bleh";
     close $pm;
 
-    # give the server time to notice the change
-    sleep 1;
+    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";
     }
@@ -93,11 +139,95 @@ for ( 1 .. 20 ) {
     like( $response, qr/Catalyst::Request/,
         'Syntax error, no restart, request OK' );
 
-    #print $server->getline;
+    # give the server some time to reindex its files
+    sleep 1;
+
 }
 
-# shut it down
-kill 'INT', $pid;
+# multiple restart directories
+
+# we need different options so we have to rebuild most
+# of the testing environment
+
+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