File 0161-runtime_tools-replace-test_server-start_no... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0161-runtime_tools-replace-test_server-start_node-with-CT.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

From 702981843491e71f7abbca7b4ce28023e63a330d Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <dane@whatsapp.com>
Date: Sat, 1 Jan 2022 17:51:48 -0700
Subject: [PATCH] [runtime_tools] replace test_server:start_node with ?CT_PEER

Also fix some test cases that may fail due to linked processes
going down when stopping the peer node.
---
 lib/runtime_tools/test/dbg_SUITE.erl          | 51 ++++++-------------
 .../test/erts_alloc_config_SUITE.erl          | 31 ++---------
 2 files changed, 20 insertions(+), 62 deletions(-)

diff --git a/lib/runtime_tools/test/dbg_SUITE.erl b/lib/runtime_tools/test/dbg_SUITE.erl
index 44e9b7d00d..c74f878785 100644
--- a/lib/runtime_tools/test/dbg_SUITE.erl
+++ b/lib/runtime_tools/test/dbg_SUITE.erl
@@ -161,9 +161,9 @@ message(Config) when is_list(Config) ->
 
 send(Config) when is_list(Config) ->
     {ok, _} = start(),
-    Node = start_slave(),
+    {ok, Peer, Node} = ?CT_PEER(),
     rpc:call(Node, code, add_patha,
-             [filename:join(proplists:get_value(data_dir, Config), "..")]),
+             [filename:dirname(proplists:get_value(data_dir, Config))]),
     try
         Echo = fun F() ->
                        receive {From, M} ->
@@ -172,7 +172,7 @@ send(Config) when is_list(Config) ->
                        end
                end,
 	Rcvr = spawn_link(Echo),
-        RemoteRcvr = spawn_link(Node, Echo),
+        RemoteRcvr = spawn(Node, Echo),
 
 	{ok, [{matched, _, 1}]} = dbg:p(Rcvr, send),
 
@@ -222,7 +222,7 @@ send(Config) when is_list(Config) ->
         %% Test that distributed dbg works
         dbg:tracer(Node, process, {fun myhandler/2, self()}),
         Rcvr2 = spawn_link(Echo),
-        RemoteRcvr2 = spawn_link(Node, Echo),
+        RemoteRcvr2 = spawn(Node, Echo),
         dbg:p(Rcvr2, [send]),
         dbg:p(RemoteRcvr2, [send]),
         dbg:tpe(send, [{['_', hej],[],[]}]),
@@ -235,7 +235,8 @@ send(Config) when is_list(Config) ->
         ok
 
     after
-	dbg:stop_clear()
+	dbg:stop_clear(),
+        peer:stop(Peer)
     end.
 
 send_test(Pid, Pattern, Msg, TraceEvent) ->
@@ -270,7 +271,7 @@ send_test_rcv(Pid, Msg, S, TraceEvent) ->
 
 recv(Config) when is_list(Config) ->
     {ok, _} = start(),
-    Node = start_slave(),
+    {ok, Peer, Node} = ?CT_PEER(),
     rpc:call(Node, code, add_patha,
              [filename:join(proplists:get_value(data_dir, Config), "..")]),
     try
@@ -281,7 +282,7 @@ recv(Config) when is_list(Config) ->
                        end
                end,
 	Rcvr = spawn_link(Echo),
-        RemoteRcvr = spawn_link(Node, Echo),
+        RemoteRcvr = spawn(Node, Echo),
 
 	{ok, [{matched, _, 1}]} = dbg:p(Rcvr, 'receive'),
 
@@ -333,7 +334,7 @@ recv(Config) when is_list(Config) ->
         %% Test that distributed dbg works
         dbg:tracer(Node, process, {fun myhandler/2, self()}),
         Rcvr2 = spawn_link(Echo),
-        RemoteRcvr2 = spawn_link(Node, Echo),
+        RemoteRcvr2 = spawn(Node, Echo),
         dbg:p(Rcvr2, ['receive']),
         dbg:p(RemoteRcvr2, ['receive']),
         dbg:tpe('receive', [{[node(), '_', '$1'],[{'==',{element,2,'$1'}, hej}],[]}]),
@@ -346,7 +347,8 @@ recv(Config) when is_list(Config) ->
         ok
 
     after
-	dbg:stop_clear()
+	dbg:stop_clear(),
+        peer:stop(Peer)
     end.
 
 recv_test(Pid, Pattern, Msg, TraceEvent) ->
@@ -382,7 +384,7 @@ recv_test_rcv(Pid, Msg, TraceEvent) ->
 %% Simple test of distributed tracing
 distributed(Config) when is_list(Config) ->
     {ok, _} = start(),
-    Node = start_slave(),
+    {ok, Peer, Node} = ?CT_PEER(),
     try
         RexPid = rpc:call(Node, erlang, whereis, [rex]),
         RexPidList = pid_to_list(RexPid),
@@ -411,7 +413,7 @@ distributed(Config) when is_list(Config) ->
         stop()
     after
         dbg:stop_clear(),
-        stop_slave(Node)
+        peer:stop(Peer)
     end,
     ok.
 
@@ -870,7 +872,7 @@ distributed_erl_tracer(Config) ->
     ok = load_nif(Config),
 
     LNode = node(),
-    RNode = start_slave(),
+    {ok, Peer, RNode} = ?CT_PEER(),
     true = rpc:call(RNode, code, add_patha, [filename:join(proplists:get_value(data_dir, Config), "..")]),
     ok = rpc:call(RNode, ?MODULE, load_nif, [Config]),
 
@@ -899,7 +901,7 @@ distributed_erl_tracer(Config) ->
     RCall = spawn_link(RNode, fun() -> ?MODULE:dummy() end),
     [{RCall, call, RNifProxy, RCall, {?MODULE, dummy, []}, #{}}] = flush(),
 
-
+    peer:stop(Peer),
     ok.
 
 load_nif(Config) ->
@@ -922,29 +924,6 @@ trace(_, _, _, _, _) ->
 %% Support functions
 %%
 
-start_slave() ->
-    Name = "asdkxlkmd" ++ integer_to_list(erlang:unique_integer([positive])),
-    {ok, Node} = test_server:start_node(Name,slave,[]),
-    ok = wait_node(Node, 15),
-    Node.
-
-stop_slave(Node) ->
-    test_server:stop_node(Node).
-
-wait_node(_,0) ->
-    no;
-wait_node(Node, N) ->
-    case net_adm:ping(Node) of
-        pong ->
-            ok;
-        pang ->
-            receive
-            after 1000 ->
-                      ok
-            end,
-            wait_node(Node, N - 1)
-    end.
-
 myhandler(Message, {wait_for_go,Pid}) ->
     receive
         {go,Pid} ->
diff --git a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
index ed24cce0bf..4019d35402 100644
--- a/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
+++ b/lib/runtime_tools/test/erts_alloc_config_SUITE.erl
@@ -76,9 +76,9 @@ basic(Config) when is_list(Config) ->
 
     os:putenv("ERL_ZFLAGS", ZFlgs ++ SbctMod),
 
-    {ok, Node1} = start_node(Config),
+    {ok, Peer1, Node1} = ?CT_PEER(),
     ok = rpc:call(Node1, ?MODULE, make_basic_config, [ErtsAllocConfig]),
-    stop_node(Node1),
+    peer:stop(Peer1),
 
     display_file(ErtsAllocConfig),
 
@@ -90,13 +90,12 @@ basic(Config) when is_list(Config) ->
 
     os:putenv("ERL_ZFLAGS", ZFlgs),
 
-    {ok, Node2} = start_node(Config,
-                             "-args_file " ++ ErtsAllocConfig
-                             ++ " -args_file " ++ ManualConfig),
+    {ok, Peer2, Node2} = ?CT_PEER(["-args_file", ErtsAllocConfig,
+                             "-args_file", ManualConfig]),
 
     {_, _, _, Cfg} = rpc:call(Node2, erlang, system_info, [allocator]),
 
-    stop_node(Node2),
+    peer:stop(Peer2),
 
     {value,{binary_alloc, BCfg}} = lists:keysearch(binary_alloc, 1, Cfg),
     {value,{sbct, 2097152}} = lists:keysearch(sbct, 1, BCfg),
@@ -160,26 +159,6 @@ display_file(FileName) ->
     io:format("eof: ~s~n", [FileName]),
     ok.
 
-mk_name(Config) when is_list(Config) ->
-    {A, B, C} = erlang:timestamp(),
-    list_to_atom(atom_to_list(?MODULE)
-                 ++ "-" ++ atom_to_list(proplists:get_value(testcase, Config))
-                 ++ "-" ++ integer_to_list(A)
-                 ++ "-" ++ integer_to_list(B)
-                 ++ "-" ++ integer_to_list(C)).
-
-start_node(Config) ->
-    start_node(Config, "").
-
-start_node(Config, Args) ->
-    Pa = filename:dirname(code:which(?MODULE)),
-    test_server:start_node(mk_name(Config),
-                           slave,
-                           [{args, "-pa " ++ Pa ++ " " ++ Args}]).
-
-stop_node(Node) ->
-    true = test_server:stop_node(Node).
-
 privfile(Name, Config) ->
     filename:join([proplists:get_value(priv_dir, Config),
                    atom_to_list(proplists:get_value(testcase, Config)) ++ "." ++ Name]).
-- 
2.31.1

Places

File 0161-runtime_tools-replace-test_server-start_node-with-CT.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places