Changeset 49

Timestamp:

04/14/09 12:56:28 (3 years ago)

Author:

dom

Message:

Added caracterisation tests to directory_watcher, then handled bad (fake) symlinks like those Emacs creates (with Charpi)

Location:

trunk/src

Files:

• directory_watcher.erl (modified) (1 diff)
• directory_watcher_test.erl (modified) (5 diffs)

trunk/src/directory_watcher.erl

@@ -28 +28 @@
 
 read_state (Filename, State) ->
-    {ok, Info} = file: read_file_info (Filename),
-    [{Filename, value (Info#file_info.type, Filename)} | State].
+    case file: read_file_info (Filename) of
+        {ok, Info} ->
+            [{Filename, value (Info#file_info.type, Filename)} | State];
+        _ ->
+            State
+    end.
 
 value (regular, Filename) ->

trunk/src/directory_watcher_test.erl

@@ -1 @@
-%%% Copyright (C) 2009 Dominic Williams
+%%% Copyright (C) 2009 Dominic Williams, Nicolas Charpentier
 %%% All rights reserved.
 %%% See file COPYING.
@@ -7 +7 @@
 -export ([tests_from_empty/0]).
 -export ([tests_from_non_existent/0]).
+-export ([tests_with_several/0]).
+-export ([bad_symlinks_are_ignored/0]).
 
 tests_from_empty () ->
@@ -25 +27 @@
     ok.
 
+tests_with_several () ->
+    Tree = [{file, "foo.txt", "Hello"},
+            {file, "bar.txt", "G'day"},
+            {file, "toto.erl", "-module(toto)."}],
+    ok = fixtures: use_tree (Tree, fun tests_with_several/2).
+
+bad_symlinks_are_ignored () ->
+    ok = fixtures: use_tree ([], fun bad_symlinks_are_ignored/2).
+
+bad_symlinks_are_ignored (Dir, _) ->
+    Watcher = spawn_link (directory_watcher, init, [Dir, notify (), ignore]),
+    Link = filename: join (Dir, "titi.erl"),
+    Destination = filename: join (Dir, "nofile"),
+    case file: make_symlink (Destination, Link) of
+        ok ->
+            Watcher ! check,
+            timeout = receive_one ();
+        {error, enotsup} ->
+            ok
+    end,
+    ok.
+    
 tests_from_empty (Dir, []) ->
     State = make_ref (),
@@ -50 +74 @@
     {watcher, unknown, Subdir, lost, State} = receive_one (),
 
+    rewrite_same_data (Filename),
+    Watcher ! check,
+    timeout = receive_one (),
+
     ok = file: write_file (Filename, list_to_binary ("Bye")),
     Watcher ! check,
@@ -58 +86 @@
     {Watcher, bye} = receive_one (),
     false = is_process_alive (Watcher),
+    ok.
+
+rewrite_same_data (Filename) ->
+    ok = file: write_file (Filename, list_to_binary ("Hello")).
+
+tests_with_several (Dir, Tree) ->
+    [Foo, Bar, Toto] = [filename: join (Dir, Name) || {file, Name, _} <- Tree],
+    State = make_ref (),
+    Watcher = spawn_link (directory_watcher, init, [Dir, notify (), State]),
+    {watcher, {file, ".txt"}, Bar, found, State} = receive_one (),
+    {watcher, {file, ".txt"}, Foo, found, State} = receive_one (),
+    {watcher, {file, ".erl"}, Toto, found, State} = receive_one (),
+    
+    ok = file: write_file (Foo, list_to_binary ("Bye")),
+    Watcher ! check,
+    {watcher, {file, ".txt"}, Foo, changed, State} = receive_one (),
+    
+    ok = file: write_file (Foo, list_to_binary ("Not yet")),
+    ok = file: write_file (Bar, list_to_binary ("Bye")),
+    Watcher ! check,
+    {watcher, {file, ".txt"}, Bar, changed, State} = receive_one (),
+    Watcher ! check,
+    {watcher, {file, ".txt"}, Foo, changed, State} = receive_one (),
     ok.