Test fixes - how did this ever pass before?

[catagits/Test-WWW-Mechanize-Catalyst.git] / t / multi_content_type.t

diff --git a/t/multi_content_type.t b/t/multi_content_type.t
index 4fb0a25..47cba51 100644 (file)
--- a/t/multi_content_type.t
+++ b/t/multi_content_type.t
@@ -7,10 +7,9 @@ my $PORT;
 
 BEGIN {
     $PORT = $ENV{TWMC_TEST_PORT} || 7357;
-    $ENV{CATALYST_SERVER} ||= "http://localhost:$PORT";
 }
 
-use Test::More tests => 9;
+use Test::More;
 use Test::Exception;
 
 BEGIN {
@@ -27,22 +26,28 @@ BEGIN {
 $SIG{INT} = sub { warn "INT:$$"; exit };
 
 use_ok 'ExternalCatty';
-my $pid = ExternalCatty->background($PORT);
+my $pid;
+($pid, $PORT) = ExternalCatty->background($PORT);
+$ENV{CATALYST_SERVER} ||= "http://localhost:$PORT";
 
 use Test::WWW::Mechanize::Catalyst;
 my $m = Test::WWW::Mechanize::Catalyst->new;
 
+# Yeah, sorry - wait for the forked process to spin up...
+sleep 10;
+
 my $skip = 0;
 TRY_CONNECT: {
   eval { $m->get('/') };
 
   if ($@ || $m->content =~ /Can't connect to \w+:$PORT/) {
     $skip = $@ || $m->content;
+    diag $m;
   }
 }
 
 SKIP: {
-  skip $skip, 8 if $skip;
+  skip $skip, 9 if $skip;
   lives_ok { $m->get_ok( '/', 'Get a multi Content-Type response' ) }
   'Survive to a multi Content-Type sting';
 
@@ -55,7 +60,7 @@ SKIP: {
   is($m->uri, "$ENV{CATALYST_SERVER}/");
 
   $m->get_ok( '/host' );
-  $m->content_contains('Host: localhost:$PORT') or diag $m->content;
+  $m->content_contains("Host: localhost:$PORT") or diag $m->content;
 
 }
 
@@ -65,5 +70,7 @@ END {
     }
 }
 
+done_testing;
+
 1;