Changeset 46 for trunk

Timestamp:

01/29/09 16:43:23 (3 years ago)

Author:

dom

Message:

Fixed a leak in fixtures:use_tree and improved boot test reports (in shells_test) in case of failure.

Location:

trunk/src

Files:

• fixtures.erl (modified) (2 diffs)
• fixtures_test.erl (modified) (4 diffs)
• shells_tests.erl (modified) (1 diff)

trunk/src/fixtures.erl

@@ -8 +8 @@
 -export ([make_tree/2, delete_tree/1]).
 -export ([use_tree/3]).
--export ([use_tree/4]).
--include_lib("kernel/include/file.hrl").
+-export ([use_tree/2]).
+-include_lib ("kernel/include/file.hrl").
 
 make_tree (Root, Tree) ->
@@ -68 +68 @@
     lists: foreach (Delete, Filename_list).
 
+use_tree (Tree, Fun) ->
+    use_tree (temporary_pathname (), Tree, Fun).
+
 use_tree (Dir, Tree, Fun) ->
-    use_tree (Dir, Tree, Fun, fun (_, _) -> ok end).
+    try
+        make_tree (Dir, Tree),
+        safe_call (Dir, Tree, Fun)
+    after
+        delete_tree (Dir)
+    end.
 
-use_tree (Dir, Tree, Use_fun, Cleanup_fun) ->
-    make_tree (Dir, Tree),
-    LastCall = case catch Use_fun (Dir, Tree) of
-                   {'EXIT', Reason} ->
-                       fun () -> exit (Reason) end;
-                   Result ->
-                       fun() -> Result end
-               end,
-    Cleanup_fun (Dir, Tree),
-    delete_tree (Dir),
-    LastCall ().
+safe_call (Dir, Tree, Fun) ->
+    Self = self (),
+    Pid = spawn_link (fun() -> safe_call (Self, Dir, Tree, Fun) end),
+    receive
+        {Pid, {'EXIT', Error}} -> exit (Error);
+        {Pid, Result} -> Result
+    end.
+
+safe_call (Parent, Dir, Tree, Fun) ->
+    process_flag (trap_exit, true),
+    Self = self (),
+    Pid = spawn_link (fun () -> Self ! {self (), Fun (Dir, Tree)} end),
+    receive
+        {Pid, Result} -> Parent ! {Self, Result};
+        {'EXIT', Pid, Error} -> Parent ! {Self, {'EXIT', Error}}
+    end.

trunk/src/fixtures_test.erl

@@ -9 +9 @@
 -export ([use_tree_creates_the_tree_first_and_destroys_it_after/0]).
 -export ([use_tree_passes_a_tree_to_a_fun/0]).
--export([use_tree_destroys_tree_even_if_fun_crashes/0]).
--export([use_tree_can_take_a_cleanup_fun/0]).
--include_lib ("kernel/include/file.hrl").
+-export ([use_tree_destroys_tree_even_if_fun_crashes/0]).
+-export ([use_tree_destroys_tree_even_if_trapexit/0]).
 
 temporary_pathname () ->
@@ -59 +58 @@
 use_tree_creates_the_tree_first_and_destroys_it_after () ->
     Tmp = fixtures: temporary_pathname (),
-    ["test", "test2", "testdir"] = fixtures: use_tree (Tmp, tree (), fun keep_real_files/2),
+    Result = fixtures: use_tree (Tmp, tree (), fun keep_real_files/2),
+    ["test", "test2", "testdir"] = Result,
     {error,enoent} = file:read_file_info (Tmp),
     pass.
@@ -69 +69 @@
     Tmp = fixtures: temporary_pathname (),
     Tree = tree (),
-    {'EXIT', {suicide, Tmp, Tree}} = (catch fixtures: use_tree (Tmp, Tree, fun suicide/2)),
+    ok =
+        try
+            fixtures: use_tree (Tmp, Tree, fun suicide/2),
+            no_crash
+        catch
+            _:{suicide, Tmp, Tree} -> ok;
+            C:E -> {unexpected, C, E}
+        end,
+    {error, enoent} = file:read_file_info (Tmp),
+    pass.
+
+spawn_undef (_, _) ->
+    spawn_link (blabla, blabla, []),
+    receive M -> M end.
+            
+use_tree_destroys_tree_even_if_trapexit () ->
+    Tmp = fixtures: temporary_pathname (),
+    ok =
+        try
+            fixtures: use_tree (Tmp, [], fun spawn_undef/2),
+            no_crash
+        catch
+            _:{undef, _} -> ok;
+            C:E -> {unexpected, C, E}
+        end,
     {error, enoent} = file:read_file_info (Tmp),
     pass.
@@ -75 +99 @@
 suicide (Dir, Tree) ->    
     exit ({suicide, Dir, Tree}).
-
-use_tree_can_take_a_cleanup_fun () ->
-    Tmp = fixtures: temporary_pathname (),
-    Tree = tree (),
-    put (cleanup_called, false),
-    Cleanup = fun (D, T) -> put (cleanup_called, {true, D, T}) end,
-    Result = (catch fixtures: use_tree (Tmp, Tree, fun suicide/2, Cleanup)),
-    {'EXIT', {suicide, Tmp, Tree}} = Result,
-    {true, Tmp, Tree} = get (cleanup_called),
-    pass.
     

trunk/src/shells_tests.erl

@@ -22 +22 @@
     Binaries = [modules: to_binary (P) || P <- Paths],
     Tester ! lists: zip (Paths, Binaries),
-    {Run, Passed} = final_test_result (),
-    Run = Passed,
+    {Run, Passed, Messages} = final_test_result ([]),
+    {passed, Run, Paths, Messages} = {passed, Passed, Paths, Messages},
     ok.
     
-final_test_result () ->
+final_test_result (Messages) ->
     receive
-        {Run, Run, Passed} ->
-            {Run, Passed};
-        _ ->
-            final_test_result ()
-    after 1000 -> timeout
+        {Run, Run, Passed} = Message ->
+            {Run, Passed, lists: reverse ([Message | Messages])};
+        Message ->
+            final_test_result ([Message | Messages])
+    after 1000 -> {timeout, Messages}
     end.