r8342@foo: jon | 2006-12-16 02:49:32 -0600

fixing the fork test (and now it passes)
r35324@cain (orig r5857):  jrockway | 2006-12-16 08:43:45 +0000

diff --git a/t/lib/TestApp/Controller/Fork.pm b/t/lib/TestApp/Controller/Fork.pm
index b6992ab..68b2c63 100644 (file)
--- a/t/lib/TestApp/Controller/Fork.pm
+++ b/t/lib/TestApp/Controller/Fork.pm
@@ -15,14 +15,13 @@ sub system : Local {
 
     if(!-e $ls || !-x _){ 
        $result = 'skip';
-       $code = 0;
     }
     else {
-       $result = system($ls, $ls, $ls) || $!;
-       $code = $?;
+       $result = system($ls, $ls, $ls);
+       $result = $! if $result != 0;
     }
     
-    $c->response->body(Dump({result => $result, code => $code}));
+    $c->response->body(Dump({result => $result}));
 }
 
 sub backticks : Local {

diff --git a/t/live_fork.t b/t/live_fork.t
index 5871dcb..0dfe7f5 100644 (file)
--- a/t/live_fork.t
+++ b/t/live_fork.t
@@ -26,8 +26,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 +39,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: