Changeset 28 for trunk

Timestamp:

06/07/08 09:09:47 (4 years ago)

Author:

dom

Message:

Revealed and fixed problem in tester when two nodes have different code paths

Location:

trunk

Files:

• . (modified) (1 prop)
• README (modified) (2 diffs)
• install (modified) (1 diff)
• src/shells.erl (added)
• src/tester.erl (modified) (2 diffs)
• src/tester_test.erl (modified) (1 diff)
• src/tests.erl (modified) (2 diffs)
• src/tests_test.erl (modified) (3 diffs)

trunk/README

@@ -7 +7 @@
 * To provide a complete, self-contained environment fulfilling the
   needs of extreme programming teams.
+* To provide a complete, self-contained environment fulfilling the
+  needs of Erlang programmers.
 * To explore some of the ideas at the forefront of extreme
   programming.
@@ -26 +28 @@
 Download the tarball, unpack to any convenient location.
 Change to the directory to which you unpacked.
-From the shell, run the 'install' escript:
+From the shell, run the 'install' script:
 
 % ./install

trunk/install

@@ -1 @@
-#!/usr/bin/env escript
-%% -*- erlang -*-
+#!/usr/bin/env bash
+# -*- sh -*-
 
-main (_) ->
-    ok = file: set_cwd ("ebin"),
-    up_to_date = make: all (),
-    ok = tests_test: filter_by_attribute (),
-    io: fwrite ("done~n", []).
+hostname=`hostname -s`
+erl -kernel error_logger "{file,\"tester.log\"}" -sname forgetester -noinput &
+cd ebin
+erl -make
+erl -kernel error_logger "{file,\"../forge.log\"}" -sname forgeinstaller -noinput -s shells install forgetester@$hostname -s init stop

trunk/src/tester.erl

@@ -4 +4 @@
 
 -module (tester).
--export ([init/2, run/2]).
-%%-import (orddict, [new/0]).
+-export ([init/2]).
 
 init (Notify, Node) ->
+    process_flag (trap_exit, true),
+    loop (Notify, Node).
+
+loop (Notify, Node) ->
     receive
         {File_name, Binary} ->
             test (File_name, Binary, Notify, Node);
         _ ->
-            init (Notify, Node)
+            loop (Notify, Node)
     end.
 
 test (File_name, Binary, Notify, Node) ->
     {Module, Tests} = tests: filter_by_attribute (Binary),
-    rpc:call (Node, code, load_binary, [Module, File_name, Binary]),
+    {module, Module} = rpc: call (Node, code, load_binary, [Module, File_name, Binary]),
     Total = length (Tests),
     Notify ({Total, 0, 0}),
     test (Total, 0, 0, Tests, Notify, Node).
 
-test (Total, Run, Passed, [T | Tests], Notify, Node) ->
-    spawn_link (Node, tester, run, [T, self ()]),
+test (Total, Run, Passed, [{M, F, A} | Tests], Notify, Node) ->
+    Pid = spawn_link (Node, M, F, A),
     New_passed =
         receive
-            {'EXIT', Reason} ->
+            {'EXIT', Pid, normal} ->
+                Passed + 1;
+            {'EXIT', Pid, Reason} ->
                 Notify (Reason),
-                Passed;
-            _ ->
-                Passed + 1
+                Passed
         end,
     New_run = Run + 1,
@@ -36 +39 @@
     test (Total, New_run, New_passed, Tests, Notify, Node);
 test (_, _, _, [], _, _) ->
-%%    init (Notify, Node).
     bye.
-
-run (Test, Tester) ->
-    Result = (catch Test ()),
-    Tester ! Result.

trunk/src/tester_test.erl

@@ -15 +15 @@
     Tester ! {"../fix/eg_test.erl", Binary},
     [{2, 0, 0}, {2, 1, 1}, Error, {2, 2, 1}] = tests: receive_all (),
-    {{badmatch, nok}, [{eg_test, nok, 0}, _]} = Error, 
+    {{badmatch, nok}, [{eg_test, nok, 0} | _]} = Error, 
     false = code: is_loaded (eg_test),
     ok.

trunk/src/tests.erl

@@ -29 +29 @@
     exports_to_funs (M, Exports, Funs);
 exports_to_funs (M, [{F, 0} | Exports], Funs) ->
-    Fun = fun () -> M: F () end,
-    exports_to_funs (M, Exports, [Fun | Funs]);
+    exports_to_funs (M, Exports, [{M, F, []} | Funs]);
 exports_to_funs (M, [{_, _} | Exports], Funs) ->
     exports_to_funs (M, Exports, Funs);
@@ -40 +39 @@
     after 10000 -> lists: reverse (Ms)
     end.
-                             

trunk/src/tests_test.erl

@@ -9 +9 @@
 filter_by_attribute () ->
     filtering_non_tests_returns_empty_list(),
-    filtering_tests_returns_list_of_funs_from_unloaded_binary (),
+    filtering_tests_returns_list_of_MFA_from_unloaded_binary (),
     filtering_fixtured_tests_returns_list_of_fixture_fun_tuples (),
     filtering_understands_mixed_export_and_fixtured_tests (),
@@ -18 +18 @@
     {eg_code, []} = tests: filter_by_attribute (Binary).
 
-filtering_tests_returns_list_of_funs_from_unloaded_binary () ->
+filtering_tests_returns_list_of_MFA_from_unloaded_binary () ->
     File_name = "../fix/eg_test.erl",
     Test = fun ([Ok, Nok]) ->
-                   ok = Ok (),
-                   {'EXIT', {{badmatch, nok}, _}} = (catch Nok ())
+                   {Ok_m, Ok_f, Ok_a} = Ok,
+                   ok = apply (Ok_m, Ok_f, Ok_a),
+                   {Nok_m, Nok_f, Nok_a} = Nok,
+                   Error = (catch apply (Nok_m, Nok_f, Nok_a)),
+                   {'EXIT', {{badmatch, nok}, _}} = Error
            end,
     filtering (File_name, eg_test, Test).
@@ -36 +39 @@
     File_name = "../fix/eg_test_fix_nofix.erl",
     Test = fun ([{Module, Fixture, With}, Without]) ->
-                   {'EXIT', {Reason, _}} = (catch Without ()),
+                   {Wo_m, Wo_f, Wo_a} = Without,
+                   {'EXIT', {Reason, _}} = (catch apply (Wo_m, Wo_f, Wo_a)),
                    {badmatch, without_fixture_ok} = Reason,
                    [ok] = Module: Fixture (With)