Changeset 8249

Timestamp:

07/20/10 03:29:41 (3 years ago)

Author:

SvenDowideit

Message:

Item9349: add try, finally to the capturing of STDERR and STDOUT so that when an exception is thrown in the code being tested, we actually do close those captures.
Additionally, put those captured outputs into testcase members so they can be retrived in that situation.

Note: it is possible that this breaks on some versions of Perl / Error.pm - please report any such failures ASAP

File:

• trunk/UnitTestContrib/lib/Unit/TestCase.pm (modified) (2 diffs)

trunk/UnitTestContrib/lib/Unit/TestCase.pm

@@ -544 +544 @@
     my $result;
 
-    {
+    undef $this->{stdout};
+    undef $this->{stderr};
+    try {
         local *STDOUT;
         local *STDERR;
@@ -551 +553 @@
         open STDERR, ">", $stderrfile
           or die "Can't open temporary STDERR file $stderrfile: $!";
+
         $result = &$proc(@params);
-    }
-
-    my $f;
-    open($f, '<', $stdoutfile) || die "Capture failed to reopen $stdoutfile";
-    local $/;
-    my $stdout = <$f>;
-    close($f);
-    open($f, '<', $stderrfile) || die "Capture failed to reopen $stderrfile";
-    local $/;
-    my $stderr = <$f>;
-    close($f);
-
-    return ( $stdout, $stderr, $result );
+    } finally {
+        my $f;
+        open($f, '<', $stdoutfile) || die "Capture failed to reopen $stdoutfile";
+        local $/;
+        $this->{stdout} = <$f>;
+        close($f);
+        open($f, '<', $stderrfile) || die "Capture failed to reopen $stderrfile";
+        local $/;
+        $this->{stderr} = <$f>;
+        close($f);
+    };
+    return ( $this->{stdout}, $this->{stderr}, $result );
 }