Changeset 55 for trunk

Timestamp:

04/26/09 12:02:19 (3 years ago)

Author:

dom

Message:

Made tests less sensitive to order of directory listings (difference between Ubuntu and Mac, or R11 and R12?)

File:

• trunk/src/directory_watcher_test.erl (modified) (2 diffs)

trunk/src/directory_watcher_test.erl

@@ -119 +119 @@
     [Foo, Bar, Toto] = [filename: join (Dir, Name) || {file, Name, _} <- Tree],
     Watcher = spawn_link (directory_watcher, init, [Dir, self ()]),
-    {{file, ".txt"}, Bar, found} = receive_one (),
-    {{file, ".txt"}, Foo, found} = receive_one (),
-    {{file, ".erl"}, Toto, found} = receive_one (),
+    Finds = [receive_one(), receive_one(), receive_one()],
+    [FoundBar, FoundFoo, FoundToto] = lists: keysort (2, Finds),
+    {{file, ".txt"}, Bar, found} = FoundBar,
+    {{file, ".txt"}, Foo, found} = FoundFoo,
+    {{file, ".erl"}, Toto, found} = FoundToto,
     
     ok = file: write_file (Foo, list_to_binary ("Bye")),
@@ -130 +132 @@
     ok = file: write_file (Bar, list_to_binary ("Bye")),
     Watcher ! check,
-    {{file, ".txt"}, Bar, changed} = receive_one (),
-    Watcher ! check,
-    {{file, ".txt"}, Foo, changed} = receive_one (),
+    Changes = [receive_one(), receive_one()],
+    [ChangedBar, ChangedFoo] = lists: keysort (2, Changes),
+    {{file, ".txt"}, Bar, changed} = ChangedBar,
+    {{file, ".txt"}, Foo, changed} = ChangedFoo,
     ok.