Changeset 47

Timestamp:

02/02/09 19:41:02 (3 years ago)

Author:

dom

Message:

Fixed (last?) bug in use_tree, which didn't delete tree if parent process was killed

Location:

trunk/src

Files:

• fixtures.erl (modified) (2 diffs)
• fixtures_test.erl (modified) (7 diffs)

trunk/src/fixtures.erl

@@ -72 +72 @@
 
 use_tree (Dir, Tree, Fun) ->
-    try
-        make_tree (Dir, Tree),
-        safe_call (Dir, Tree, Fun)
-    after
-        delete_tree (Dir)
-    end.
-
-safe_call (Dir, Tree, Fun) ->
     Self = self (),
     Pid = spawn_link (fun() -> safe_call (Self, Dir, Tree, Fun) end),
@@ -90 +82 @@
     process_flag (trap_exit, true),
     Self = self (),
+    make_tree (Dir, Tree),
     Pid = spawn_link (fun () -> Self ! {self (), Fun (Dir, Tree)} end),
-    receive
+    receive M -> delete_tree (Dir) end,
+    case M of
         {Pid, Result} -> Parent ! {Self, Result};
-        {'EXIT', Pid, Error} -> Parent ! {Self, {'EXIT', Error}}
+        {'EXIT', Pid, Error} -> Parent ! {Self, {'EXIT', Error}};
+        _ -> ignore
     end.

trunk/src/fixtures_test.erl

@@ -11 +11 @@
 -export ([use_tree_destroys_tree_even_if_fun_crashes/0]).
 -export ([use_tree_destroys_tree_even_if_trapexit/0]).
+-export ([use_tree_destroys_tree_even_if_killed_by_parent_link/0]).
 
 temporary_pathname () ->
@@ -28 +29 @@
      {file, "test2", ["Goodbye", "world!"]},
      {directory, "testdir",
-      [{file, "toto", "Silly"}, {directory, "testdir2", [{file, "titi", "Very silly"}]}]}].
+      [{file, "toto", "Silly"},
+       {directory, "testdir2", [{file, "titi", "Very silly"}]}]}].
+    
+test_tree (Dir) ->
+    fun ({Path, Expected}, Count) ->
+            Filename = filename: join ([Dir | Path]),
+            {ok, Content} = file: read_file (Filename),
+            {Count, Expected} = {Count, binary_to_list (Content)},
+            Count + 1
+    end.
     
 tree_handling () ->
@@ -34 +44 @@
     Tree = tree (),
     fixtures: make_tree (Tmp_dirname, Tree),
-    {ok, Content} = file: read_file (filename: join (Tmp_dirname, "test")),
-    "Hello world" = binary_to_list (Content),
-    {ok, Content2} = file: read_file (filename: join (Tmp_dirname, "test2")),
-    "Goodbye\nworld!" = binary_to_list (Content2),
-    {ok, Content3} = file: read_file (filename:join ([Tmp_dirname, "testdir", "toto"])),
-    "Silly" = binary_to_list (Content3),
-    File4 = filename: join ([Tmp_dirname, "testdir", "testdir2", "titi"]),
-    {ok, Content4} = file: read_file (File4),
-    "Very silly" = binary_to_list (Content4),
+    Test = test_tree (Tmp_dirname),
+    Table =
+        [{["test"], "Hello world"},
+         {["test2"], "Goodbye\nworld!"},
+         {["testdir", "toto"], "Silly"},
+         {["testdir", "testdir2", "titi"], "Very silly"}],
+    lists: foldl (Test, 1, Table),
     fixtures: delete_tree (Tmp_dirname),
     {error, enoent} = file: read_file_info (Tmp_dirname),
@@ -60 +68 @@
     Result = fixtures: use_tree (Tmp, tree (), fun keep_real_files/2),
     ["test", "test2", "testdir"] = Result,
-    {error,enoent} = file:read_file_info (Tmp),
+    {error,enoent} = file: read_file_info (Tmp),
     pass.
 
@@ -74 +82 @@
             no_crash
         catch
-            _:{suicide, Tmp, Tree} -> ok;
-            C:E -> {unexpected, C, E}
+            _: {suicide, Tmp, Tree} -> ok;
+            C: E -> {unexpected, C, E}
         end,
-    {error, enoent} = file:read_file_info (Tmp),
+    {error, enoent} = file: read_file_info (Tmp),
     pass.
 
@@ -91 +99 @@
             no_crash
         catch
-            _:{undef, _} -> ok;
+            _: {undef, _} -> ok;
             C:E -> {unexpected, C, E}
         end,
-    {error, enoent} = file:read_file_info (Tmp),
+    {error, enoent} = file: read_file_info (Tmp),
     pass.
 
@@ -100 +108 @@
     exit ({suicide, Dir, Tree}).
     
+use_tree_destroys_tree_even_if_killed_by_parent_link () ->
+    Tmp = fixtures: temporary_pathname (),
+    Self = self (),
+    ok =
+        try
+            Long = fun (_, _) -> Self ! tree_built, timer: sleep (5000) end,
+            Use_tree = fun () -> fixtures: use_tree (Tmp, [], Long) end,
+            Impatient = fun () -> spawn_link (Use_tree),
+                                  receive tree_built -> ok end,
+                                  throw (stop) end,
+            Pid = spawn (Impatient),
+            receive tree_built -> Pid ! tree_built end,
+            ok
+        catch
+            C: E -> {unexpected, C, E}
+        end,
+    timer: sleep (500),
+    {error, enoent} = file: read_file_info (Tmp),
+    pass.