Changeset 39 for trunk

Timestamp:

09/20/08 08:40:17 (4 years ago)

Author:

charpi

Message:

Delete a module from the test node

Location:

trunk/src

Files:

• shells.erl (modified) (1 diff)
• tester.erl (modified) (2 diffs)
• tester_test.erl (modified) (3 diffs)

trunk/src/shells.erl

@@ -31 +31 @@
     ok = tester_test: runs_given_tests (Test_node),
     ok = tester_test: reloads_corrected_module (Test_node),
+    ok = tester_test: deletes_a_module (Test_node),
+    ok = tester_test: deletes_a_test_module (Test_node),
     Caller ! {Caller, done}.
     

trunk/src/tester.erl

@@ -15 +15 @@
 loop (State) ->
     receive
+        {delete, Modules} ->
+            loop (test (unload (Modules, State)));
         Modules ->
             loop (test (load (Modules, State)))
@@ -37 +39 @@
     lists: foldl (test_fun (State, Total), {0, 0}, Tests),
     State.
+
+unload (Modules, State) ->
+    lists: foldl (fun unload_aux/2, State, Modules).
+
+unload_aux (Module, State) ->
+    Node = dict: fetch (node, State),
+    rpc: call (Node, code, purge, [Module]),
+    rpc: call (Node, code, delete, [Module]),
+    false = rpc: call (Node, code, is_loaded, [Module]),
+    Tests = dict: fetch (tests, State),
+    New_tests = dict: erase (Module, Tests),
+    dict :store (tests, New_tests, State).
 
 flatten (Tests) ->

trunk/src/tester_test.erl

@@ -7 +7 @@
 -export ([runs_given_tests/1, runs_given_test_sequence/1]).
 -export ([reloads_corrected_module/1]).
+-export ([deletes_a_module /1]).
+-export ([deletes_a_test_module /1]).
 
 start_tester (Node) ->
@@ -67 +69 @@
     ok.
 
+deletes_a_module (Node) ->
+    Tester = start_tester (Node),
+    [{1, 0, 0}, {1, 1, 1}] = send ([eg_test_of_code], Tester),
+    Tester ! {delete,[eg_code]},
+    [{1, 0, 0}, Error, {1, 1, 0}] = receive_all ([]),
+    {undef, [{eg_code, ok, []}, {eg_test_of_code, ok, 0} | _]} = Error,
+    [{1, 0, 0}, {1, 1, 1}] = send ([eg_code], Tester),
+    ok.
+
+deletes_a_test_module (Node) ->
+    Tester = start_tester (Node),
+    [{1, 0, 0}, {1, 1, 1}] = send ([eg_test_of_code], Tester),
+    Tester ! {delete,[eg_test_of_code]},
+    [{0, 0, 0}] = receive_all ([]),
+    [{1, 0, 0}, {1, 1, 1}] = send ([eg_test_of_code], Tester),
+    ok.
+
 receive_all (Ms) ->
     receive
@@ -74 +93 @@
             receive_all ([M | Ms])
     end.
-
 
 eg_test_form (String) ->