[Catalyst-commits] r14300 - in Test-WWW-Mechanize-Catalyst/trunk: . t t/lib

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2012-05-13 20:17:16 +0000 (Sun, 13 May 2012)
New Revision: 14300

Modified:
   Test-WWW-Mechanize-Catalyst/trunk/Makefile.PL
   Test-WWW-Mechanize-Catalyst/trunk/t/lib/ExternalCatty.pm
   Test-WWW-Mechanize-Catalyst/trunk/t/multi_content_type.t
Log:
Fix starting the server, test still fucked however

Modified: Test-WWW-Mechanize-Catalyst/trunk/Makefile.PL
===================================================================
--- Test-WWW-Mechanize-Catalyst/trunk/Makefile.PL	2012-05-13 20:06:12 UTC (rev 14299)
+++ Test-WWW-Mechanize-Catalyst/trunk/Makefile.PL	2012-05-13 20:17:16 UTC (rev 14300)
@@ -8,7 +8,7 @@
 perl_version '5.008004';
 all_from 'lib/Test/WWW/Mechanize/Catalyst.pm';
 
-requires 'Catalyst'                                 => '5.00';
+requires 'Catalyst'                                 => '5.90';
 requires 'LWP'                                      => '5.816';
 requires 'Test::WWW::Mechanize'                     => '1.14';
 requires 'WWW::Mechanize'                           => '1.54';

Modified: Test-WWW-Mechanize-Catalyst/trunk/t/lib/ExternalCatty.pm
===================================================================
--- Test-WWW-Mechanize-Catalyst/trunk/t/lib/ExternalCatty.pm	2012-05-13 20:06:12 UTC (rev 14299)
+++ Test-WWW-Mechanize-Catalyst/trunk/t/lib/ExternalCatty.pm	2012-05-13 20:17:16 UTC (rev 14300)
@@ -2,11 +2,11 @@
 use strict;
 use warnings;
 use Catalyst;
+use Catalyst::ScriptRunner;
 use IO::Socket::INET;
 
 __PACKAGE__->config( name => 'ExternalCatty' );
 __PACKAGE__->setup;
-__PACKAGE__->setup_engine('HTTP');
 
 sub MAX_PORT_TRIES() { 5 }
 
@@ -24,8 +24,8 @@
         require POSIX;
         POSIX::setsid() or die "Can't start a new session: $!";
     }
-
-    return($self->run($port), $port);
+    local @ARGV = ('-p', $port);
+    Catalyst::ScriptRunner->run(__PACKAGE__, 'Server');
 }
 
 sub assert_or_find_available_port {

Modified: Test-WWW-Mechanize-Catalyst/trunk/t/multi_content_type.t
===================================================================
--- Test-WWW-Mechanize-Catalyst/trunk/t/multi_content_type.t	2012-05-13 20:06:12 UTC (rev 14299)
+++ Test-WWW-Mechanize-Catalyst/trunk/t/multi_content_type.t	2012-05-13 20:17:16 UTC (rev 14300)
@@ -9,7 +9,7 @@
     $PORT = $ENV{TWMC_TEST_PORT} || 7357;
 }
 
-use Test::More tests => 9;
+use Test::More;
 use Test::Exception;
 
 BEGIN {
@@ -33,6 +33,9 @@
 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('/') };
@@ -67,5 +70,7 @@
     }
 }
 
+done_testing;
+
 1;