X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flive_fork.t;h=e716b386b6557842f1b331d7cc0f40443250c970;hp=1fefc2af881d2dde436a38fcd782b624d9da54a2;hb=5757858f133f7f1e92dd996dad0f6e28b0b919ed;hpb=ab95b8e30f63584e5854e4240da1f4bc29a5f803

diff --git a/t/live_fork.t b/t/live_fork.t
index 1fefc2a..e716b38 100644
--- a/t/live_fork.t
+++ b/t/live_fork.t
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # live_fork.t
 # Copyright (c) 2006 Jonathan Rockway <jrockway@cpan.org>
 
@@ -13,9 +12,7 @@ use Test::More;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 use Catalyst::Test qw(TestApp);
-
-eval 'use YAML';
-plan skip_all => 'YAML required' if $@;
+use JSON::MaybeXS qw(decode_json);
 
 plan skip_all => 'Using remote server (and REMOTE_FORK not set)'
     if $ENV{CATALYST_SERVER} && !$ENV{REMOTE_FORK};
@@ -23,37 +20,46 @@ plan skip_all => 'Using remote server (and REMOTE_FORK not set)'
 plan skip_all => 'Skipping fork tests: no /bin/ls'
     if !-e '/bin/ls'; # see if /bin/ls exists
 
-plan tests => 13; # otherwise
-
 {
     ok(my $result = get('/fork/system/%2Fbin%2Fls'), 'system');
-    my @result = split /$/m, $result;
-    $result = join q{}, @result[-4..-1];
 
-    my $result_ref = eval { Load($result) };
-    ok($result_ref, 'is YAML');
-    is($result_ref->{result}, 0, 'exited OK');
+    if (my $result_ref = result_ok($result)) {
+        ok($result_ref, 'is JSON');
+        is($result_ref->{result}, 0, 'exited OK');
+    }
 }
 
 {
     ok(my $result = get('/fork/backticks/%2Fbin%2Fls'), '`backticks`');
-    my @result = split /$/m, $result;
-    $result = join q{}, @result[-4..-1];
-
-    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$');
-    like($result_ref->{result}, qr{\n.*\n}m, 'contains two newlines');
+
+    if (my $result_ref = result_ok($result)) {
+        ok($result_ref, 'is JSON');
+        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');
+    }
 }
+
 {
     ok(my $result = get('/fork/fork'), 'fork');
-    my @result = split /$/m, $result;
-    $result = join q{}, @result[-4..-1];
-
-    my $result_ref = eval { Load($result) };
-    ok($result_ref, 'is YAML');
-    isnt($result_ref->{pid}, 0, q{fork's "pid" wasn't 0});
-    isnt($result_ref->{pid}, $$, 'fork got a new pid');
-    is($result_ref->{result}, 'ok', 'fork was effective');
+
+    if (my $result_ref = result_ok($result)) {
+        ok($result_ref, 'is JSON');
+        isnt($result_ref->{pid}, 0, q{fork's "pid" wasn't 0});
+        isnt($result_ref->{pid}, $$, 'fork got a new pid');
+        is($result_ref->{result}, 'ok', 'fork was effective');
+    }
 }
+
+sub result_ok {
+    my $result = shift;
+
+    unlike( $result, qr/FATAL/, 'result is not an error' )
+        or return;
+
+    $result =~ s/\r\n|\r/\n/g;
+
+    return eval { decode_json($result) };
+}
+
+done_testing;