use File::Path;
use FindBin;
-use IO::Socket;
+use Test::TCP;
+use Try::Tiny;
+use Plack::Builder;
use Catalyst::Devel 1.0;
use File::Copy::Recursive;
rmtree '../t/tmp/TestApp/t' or die;
# spawn the standalone HTTP server
-my $port = 30000 + int rand(1 + 10000);
+my $port = empty_port;
my $pid = fork;
if ($pid) {
# parent.
print "Waiting for server to start...\n";
- my $timeout = 30;
- my $count = 0;
- while ( check_port( 'localhost', $port ) != 1 ) {
- sleep 1;
- die "Server did not start within $timeout seconds:"
- if $count++ > $timeout;
- }
+ wait_port_timeout($port, 30);
} elsif ($pid == 0) {
# child process
unshift @INC, "$tmpdir/TestApp/lib", "$FindBin::Bin/../../lib";
require TestApp;
my $psgi_app = TestApp->_wrapped_legacy_psgi_app(TestApp->psgi_app);
- Plack::Loader->auto(port => $port)->run($psgi_app);
+ Plack::Loader->auto(port => $port)->run(builder {
+ mount '/test_prefix' => $psgi_app;
+ mount '/' => sub {
+ return [501, ['Content-Type' => 'text/plain'], ['broken tests']];
+ };
+ });
exit 0;
} else {
}
# run the testsuite against the HTTP server
-$ENV{CATALYST_SERVER} = "http://localhost:$port";
+$ENV{CATALYST_SERVER} = "http://localhost:$port/test_prefix";
chdir '..';
is( $return, 0, 'live tests' );
-sub check_port {
- my ( $host, $port ) = @_;
-
- my $remote = IO::Socket::INET->new(
- Proto => "tcp",
- PeerAddr => $host,
- PeerPort => $port
- );
- if ($remote) {
- close $remote;
- return 1;
- }
- else {
- return 0;
+sub wait_port_timeout {
+ my ($port, $timeout) = @_;
+
+ # wait_port waits for 10 seconds
+ for (1 .. int($timeout / 10)) { # meh, good enough.
+ try { wait_port $port; 1 } and return;
}
+
+ die "Server did not start within $timeout seconds";
}
sub prove {