-#!perl
-
# This test tests the standalone server's auto-restart feature.
use strict;
use warnings;
+use Test::More;
+BEGIN {
+ plan skip_all => 'set TEST_HTTP to enable this test' unless $ENV{TEST_HTTP};
+}
+
use File::Path;
use FindBin;
use LWP::Simple;
use IO::Socket;
-use Test::More;
+use IPC::Open3;
use Time::HiRes qw/sleep/;
-eval "use Catalyst::Devel 1.0;";
+eval {require Catalyst::Devel; Catalyst::Devel->VERSION(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;
+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", '-MFile::Spec', '-e', "\@ARGV=('TestApp'); my \$devnull = File::Spec->devnull; open my \$fh, '>', \$devnull or die \"Cannot write to \$devnull: \$!\"; *STDOUT = \$fh; do \"$FindBin::Bin/../script/catalyst.pl\"");
+
chdir "$FindBin::Bin/..";
File::Copy::Recursive::dircopy( 't/lib', 't/tmp/TestApp/lib' );
# 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 );
+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
+# gracefully instead of just hanging forever
+
+$server->blocking( 0 );
# wait for it to start
print "Waiting for server to start...\n";
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/Engine/Request/URI.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
+NON_ERROR_RESTART:
for ( 1 .. 20 ) {
my $index = rand @files;
open my $pm, '>>', $files[$index]
# give the server time to notice the change and restart
my $count = 0;
- sleep 1;
+ my $line;
+ while ( ( $line || '' ) !~ /ttempting to restart the server/ ) {
+ # 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
-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;
+# multiple restart directories
- # give the server time to notice the change
- sleep 1;
- 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' );
+# we need different options so we have to rebuild most
+# of the testing environment
- #print $server->getline;
-}
-
-# shut it down
-kill 'INT', $pid;
+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 ) = @_;