eunit: Pass node name to {node, ...} instantiator

The migration from slave to peer in OTP-28 discarded the node
name returned by peer:start_link/1, passing the Pid to the
instantiator instead of the node name. This made {node, ...}
unusable since the instantiator needs the node name to use
with {spawn, Node, Tests} or erpc:call/4.

Capture the node name and wrap the instantiator so it receives
the node name as an atom. Restore auto-start of net_kernel
for non-distributed nodes so {node, ...} works out of the box.

Author: williamthome

lib/eunit/src/eunit_data.erl

@@ -388,45 +388,54 @@ parse({node, N, A, T1}=T, Options) when is_atom(N) ->
     case eunit_lib:is_string(A) of
 	true ->
 	    %% TODO: better stack traces for internal funs like these
+	    %% Wrap T1 so the instantiator receives the node name
+	    T2 = case T1 of
+		     F when is_function(F, 1) ->
+			 fun({_Peer, NodeName, _}) -> F(NodeName) end;
+		     {with, As} when is_list(As) ->
+			 fun({_Peer, NodeName, _}) ->
+			     {with, NodeName, As}
+			 end;
+		     _ ->
+			 T1
+		 end,
 	    parse({setup,
 		   fun () ->
-			   %% TODO: auto-start net_kernel if needed
- 			   StartedNet = false,
-%% The following is commented out because of problems when running
-%% eunit as part of the init sequence (from the command line):
-%% 			   StartedNet =
-%% 			       case whereis(net_kernel) of
-%% 				   undefined ->
-%% 				       M = list_to_atom(atom_to_list(N)
-%% 							++ "_master"),
-%% 				       case net_kernel:start([M]) of
-%% 					   {ok, _} ->
-%% 					       true;
-%% 					   {error, E} ->
-%% 					       throw({net_kernel_start, E})
-%% 				       end;
-%% 				   _ -> false
-%% 			       end,
-%% 			   ?debugVal({started, StartedNet}),
 			   {Name, Host} = eunit_lib:split_node(N),
-                           {ok, Node} = case peer:start_link(#{
+			   StartedNet =
+			       case node() of
+				   'nonode@nohost' ->
+				       M = list_to_atom(atom_to_list(Name)
+							++ "_master"),
+				       case net_kernel:start(M, #{name_domain => shortnames}) of
+					   {ok, _} ->
+					       true;
+					   {error, E} ->
+					       throw({net_kernel_start, E})
+				       end;
+				   _ -> false
+			       end,
+			   PathArgs = lists:flatmap(
+					fun(P) -> ["-pa", P] end,
+					code:get_path()),
+                           {ok, Peer, NodeName} = case peer:start_link(#{
                                host => atom_to_list(Host),
-                               name => Name, args => parse_peer_args(A)}) of
-                                {ok, Pid} -> {ok, Pid};
-                                {ok, Pid, _Node} -> {ok, Pid};
+                               name => Name,
+			       args => PathArgs ++ parse_peer_args(A)}) of
+                                {ok, Pid, Node0} -> {ok, Pid, Node0};
                                 {error, Rsn} -> throw({peer_start, Rsn})
                             end,
-			   {Node, StartedNet}
+			   {Peer, NodeName, StartedNet}
 		   end,
-		   fun ({Node, StopNet}) ->
+		   fun ({Peer, _NodeName, StopNet}) ->
 %% 			   ?debugVal({stop, StopNet}),
-                           peer:stop(Node),
+                           peer:stop(Peer),
 			   case StopNet of
 			       true -> net_kernel:stop();
 			       false -> ok
 			   end
 		   end,
-		   T1}, Options);
+		   T2}, Options);
 	false ->
 	    bad_test(T)
     end;
@@ -844,7 +853,7 @@ data_test_() ->
      ?_assertMatch(ok, eunit:test({spawn, Tests})),
      ?_assertMatch(ok, eunit:test({setup, Setup, Cleanup,
 				   fun (P) -> ?_test(ok = ping(P)) end})),
-     %%?_assertMatch(ok, eunit:test({node, test@localhost, Tests})),
+     ?_assertMatch(ok, eunit:test({node, test@localhost, Tests})),
      ?_assertMatch(ok, eunit:test({module, eunit_lib})),
      ?_assertMatch(ok, eunit:test(eunit_lib)),
      ?_assertMatch(ok, eunit:test("examples/tests.txt"))

lib/eunit/test/eunit_SUITE.erl

@@ -24,7 +24,7 @@
 -export([all/0, suite/0, groups/0, init_per_suite/1, end_per_suite/1,
 	 init_per_group/2, end_per_group/2,
 	 app_test/1, appup_test/1, eunit_test/1, eunit_exact_test/1,
-         fixture_test/1, primitive_test/1, surefire_utf8_test/1,
+         fixture_test/1, node_test/1, primitive_test/1, surefire_utf8_test/1,
          surefire_latin_test/1, surefire_c0_test/1, surefire_ensure_dir_test/1,
          stacktrace_at_timeout_test/1, scale_timeouts_test/1,
          report_failed_setup_inparallel_test/1, parse_commandline_test/1]).
@@ -42,8 +42,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
     [app_test, appup_test, eunit_test, eunit_exact_test, primitive_test,
-     fixture_test, surefire_utf8_test, surefire_latin_test, surefire_c0_test,
-     surefire_ensure_dir_test, stacktrace_at_timeout_test,
+     fixture_test, node_test, surefire_utf8_test, surefire_latin_test,
+     surefire_c0_test, surefire_ensure_dir_test, stacktrace_at_timeout_test,
      scale_timeouts_test, report_failed_setup_inparallel_test,
      parse_commandline_test].
 
@@ -155,6 +155,26 @@ fixture_test(Config) when is_list(Config) ->
                 [{1, fun(_A, _B) -> fun() -> a_test end end}]}),
     ok.
 
+node_test(Config) when is_list(Config) ->
+    T = fun() -> ok end,
+    %% Plain tests
+    ok = eunit:test({node, eunit_node_plain, [T, T, T]}),
+    %% Instantiator receives node name as atom
+    ok = eunit:test(
+        {node, eunit_node_inst, fun(Node) ->
+            true = is_atom(Node),
+            {spawn, Node, [
+                fun() -> Node = node() end
+            ]}
+        end}),
+    %% With extra args
+    ok = eunit:test(
+        {node, eunit_node_args, "+S 1", fun(Node) ->
+            true = is_atom(Node),
+            {spawn, Node, [T]}
+        end}),
+    ok.
+
 check_test_results(Primitive, Expected) ->
     receive
         {test_report, TestReport} ->