X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Foptional_http-server-restart.t;h=3d3cb3fc9dee45501b63c4719b5723e827aaa7fd;hb=62b6b631cf9141ffd9ae02e4b87c182b080b335a;hp=e004ac89a4119b80730bea51a8f4b41356148e2d;hpb=4853fb50e3c7138bbe513fed2b22574a2d988ed1;p=catagits%2FCatalyst-Runtime.git diff --git a/t/optional_http-server-restart.t b/t/optional_http-server-restart.t index e004ac8..3d3cb3f 100644 --- a/t/optional_http-server-restart.t +++ b/t/optional_http-server-restart.t @@ -13,6 +13,7 @@ use FindBin; use LWP::Simple; use IO::Socket; use IPC::Open3; +use Catalyst::Engine::HTTP::Restarter::Watcher; use Time::HiRes qw/sleep/; eval "use Catalyst::Devel 1.0;"; @@ -44,10 +45,11 @@ rmtree 't/tmp/TestApp/t'; my $port = 30000 + int rand( 1 + 10000 ); my( $server, $pid ); -$pid = open3( undef, $server, undef, - $^X, "-I$FindBin::Bin/../lib", +my @cmd = ($^X, "-I$FindBin::Bin/../lib", "-I$FindBin::Bin/lib", "$FindBin::Bin/../t/tmp/TestApp/script/testapp_server.pl", '-port', - $port, '-restart' ) + $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 @@ -65,7 +67,8 @@ while ( check_port( 'localhost', $port ) != 1 ) { 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 @@ -80,7 +83,6 @@ for ( 1 .. 20 ) { # 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;