Fix test

[catagits/Catalyst-Runtime.git] / t / live_fork.t

diff --git a/t/live_fork.t b/t/live_fork.t
index 5871dcb..3abe4e2 100644 (file)
--- a/t/live_fork.t
+++ b/t/live_fork.t
@@ -10,12 +10,19 @@ Tests if Catalyst can fork/exec other processes successfully
 use strict;
 use warnings;
 use Test::More;
-use YAML;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 use Catalyst::Test qw(TestApp);
 
-plan 'skip_all' if !-e '/bin/ls'; # see if /bin/ls exists
+eval 'use YAML';
+plan skip_all => 'YAML required' if $@;
+
+plan skip_all => 'Using remote server'
+    if $ENV{CATALYST_SERVER};
+    
+plan skip_all => 'Skipping fork tests: no /bin/ls'
+    if !-e '/bin/ls'; # see if /bin/ls exists
+    
 plan tests => 13; # otherwise
 
 {
@@ -26,8 +33,7 @@ plan tests => 13; # otherwise
     
     my $result_ref = eval { Load($result) };
     ok($result_ref, 'is YAML');
-    is($result_ref->{code}, 0, 'exited successfully');
-    like($result_ref->{result}, qr{^/bin/ls[^:]}, 'contains ^/bin/ls$');
+    is($result_ref->{result}, 0, 'exited OK');
 }
 
 { 
@@ -40,6 +46,7 @@ plan tests => 13; # otherwise
     ok($result_ref, 'is YAML');
     is($result_ref->{code}, 0, 'exited successfully');
     like($result_ref->{result}, qr{^/bin/ls[^:]}, 'contains ^/bin/ls$');
+    like($result_ref->{result}, qr{\n.*\n}m, 'contains two newlines');
 }
 { 
   fork: