X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Foptional_threads.t;h=3d7dd8abf47e1809d6a8033e04704bbf875eb263;hp=baa40894dbed44bb1bb49e14157c62e6bf2b6eef;hb=4e45fa288ea80bf2a4587dd2278c784286aafdc3;hpb=4853fb50e3c7138bbe513fed2b22574a2d988ed1 diff --git a/t/optional_threads.t b/t/optional_threads.t index baa4089..3d7dd8a 100644 --- a/t/optional_threads.t +++ b/t/optional_threads.t @@ -1,5 +1,3 @@ -#!perl - use strict; use warnings; @@ -28,15 +26,16 @@ else { plan skip_all => 'Needs a Perl with ithreads enabled'; } } - + no warnings 'redefine'; -sub request { - my $thr = threads->new( - sub { Catalyst::Test::local_request('TestApp',@_) }, - @_ +my $request_code = \&request; +*request = sub { + my $thr = threads->new( + sub { $request_code->(@_) }, + @_ ); $thr->join; -} +}; # test that running inside a thread works ok { @@ -44,11 +43,11 @@ sub request { TestApp::Controller::Action::Default->begin TestApp::Controller::Action::Default->default TestApp::View::Dump::Request->process - TestApp->end + TestApp::Controller::Root->end ]; my $expected = join( ", ", @expected ); - + ok( my $response = request('http://localhost/action/default'), 'Request' ); ok( $response->is_success, 'Response Successful 2xx' ); is( $response->header('X-Catalyst-Executed'), $expected, 'Executed actions' );