X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fauthor%2Fhttp-server.t;h=2861c275ce9d12ae06c3ccc0830fa61005bf676f;hb=35b3434762d426e0cd5e04eb735291f8ca7ea08e;hp=2927f18151408d64b1ac5a9113350956a2131a19;hpb=4d7d4257076031cc63eaf82ce863e3179fcdbc12;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/author/http-server.t b/t/author/http-server.t
index 2927f18..2861c27 100644
--- a/t/author/http-server.t
+++ b/t/author/http-server.t
@@ -2,15 +2,23 @@ use strict;
 use warnings;
 
 use Test::More tests => 1;
+use Test::TCP;
 
 use File::Path;
 use FindBin;
-use Test::TCP;
+use Net::EmptyPort qw(wait_port empty_port);
 use Try::Tiny;
 use Plack::Builder;
 
-use Catalyst::Devel 1.0;
-use File::Copy::Recursive;
+eval { require Catalyst::Devel; Catalyst::Devel->VERSION(1.0); 1; } || do {
+    fail("Could not load Catalyst::Devel: $@");
+    exit 1;
+};
+
+eval { require File::Copy::Recursive; 1 } || do {
+    fail("Could not load File::Copy::Recursive: $@");
+    exit 1;
+};
 
 # Run a single test by providing it as the first arg
 my $single_test = shift;
@@ -89,10 +97,7 @@ if ($^O eq 'MSWin32') {
 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;
-    }
+    wait_port($port, $timeout * 10) and return;
 
     die "Server did not start within $timeout seconds";
 }