File 1697-ct_slave-replace-ct_slave-with-CT_PEER.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1697-ct_slave-replace-ct_slave-with-CT_PEER.patch of Package erlang (Revision 5b89568f64d9961d3b4b7c988ecff390)

Currently displaying revision 5b89568f64d9961d3b4b7c988ecff390 , Show latest

From b67b337f0ceb60c5a9ca87ff808b93b3f846703b Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <maximfca@gmail.com>
Date: Mon, 11 Oct 2021 22:58:25 -0700
Subject: [PATCH 7/7] [ct_slave] replace ct_slave with ?CT_PEER()

Converge to using ?CT_PEER() in all OTP test cases.
---
 lib/kernel/test/erl_distribution_SUITE.erl |  12 +-
 lib/kernel/test/socket_SUITE.erl           | 153 ++++++---------------
 lib/sasl/test/sasl_report_SUITE.erl        |  10 +-
 lib/sasl/test/systools_SUITE.erl           |   7 +-
 lib/stdlib/test/gen_statem_SUITE.erl       | 102 ++++++--------
 lib/tools/test/make_SUITE.erl              |  14 +-
 6 files changed, 102 insertions(+), 196 deletions(-)

diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index d254bc2789..859369a916 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -1676,14 +1676,10 @@ monitor_nodes_many(DCfg, _Config) ->
 
 %% Test order of messages nodedown and nodeup.
 monitor_nodes_down_up(Config) when is_list(Config) ->
-    [An] = get_nodenames(1, monitor_nodeup),
-    {ok, A} = ct_slave:start(An),
-
-    try
-        monitor_nodes_yoyo(A)
-    after
-        catch ct_slave:stop(A)
-    end.
+    {ok, Peer, Node} = ?CT_PEER(#{connection => 0}),
+    true = net_kernel:connect_node(Node),
+    monitor_nodes_yoyo(Node),
+    peer:stop(Peer).
 
 monitor_nodes_yoyo(A) ->
     net_kernel:monitor_nodes(true),
diff --git a/lib/kernel/test/socket_SUITE.erl b/lib/kernel/test/socket_SUITE.erl
index 5cecd308f3..29c50050ae 100644
--- a/lib/kernel/test/socket_SUITE.erl
+++ b/lib/kernel/test/socket_SUITE.erl
@@ -16417,11 +16417,11 @@ api_opt_sock_peercred_tcp(_InitState) ->
     %%      #{desc => "create node",
     %%        cmd  => fun(#{host := Host} = State) ->
     %%     		   ?SEV_IPRINT("try create node on ~p", [Host]),
-    %%                        case start_node(Host, client) of
-    %%                            {ok, Node} ->
+    %%                        case ?CT_PEER() of
+    %%                            {ok, Peer, Node} ->
     %%                                ?SEV_IPRINT("client node ~p started",
     %%                                            [Node]),
-    %%                                {ok, State#{node => Node}};
+    %%                                {ok, State#{node => Node, peer => Peer}};
     %%                            {error, Reason} ->
     %%                                {skip, Reason}
     %%                        end
@@ -16530,8 +16530,8 @@ api_opt_sock_peercred_tcp(_InitState) ->
     %%                        {ok, State1}
     %%                end},
     %%      #{desc => "stop client node",
-    %%        cmd  => fun(#{node := Node} = _State) ->
-    %%                        stop_node(Node)
+    %%        cmd  => fun(#{peer := Peer} = _State) ->
+    %%                        peer:stop(Peer)
     %%                end},
     %%      #{desc => "await client node termination",
     %%        cmd  => fun(#{node := Node} = State) ->
@@ -24056,11 +24056,11 @@ api_to_connect_tcp(InitState) ->
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
 			   ?SEV_IPRINT("try create node on ~p", [Host]),
-                           case start_node(Host, client) of
-                               {ok, Node} ->
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
                                    ?SEV_IPRINT("client node ~p started",
                                                [Node]),
-                                   {ok, State#{node => Node}};
+                                   {ok, State#{node => Node, peer => Peer}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -24168,8 +24168,8 @@ api_to_connect_tcp(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop client node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await client node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -33116,12 +33116,11 @@ sc_rc_receive_response_tcp(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host, node_id := NodeID} = State) ->
-                           case start_node(Host,
-                                           l2a(f("client_~w", [NodeID]))) of
-                               {ok, Node} ->
+                           case ?CT_PEER(#{name => ?CT_PEER_NAME(f("client_~w", [NodeID]))}) of
+                               {ok, Peer, Node} ->
                                    ?SEV_IPRINT("client node ~p started",
                                                [Node]),
-                                   {ok, State#{node => Node}};
+                                   {ok, State#{node => Node, peer => Peer}};
                                {error, Reason} ->
                                    ?SEV_EPRINT("failed starting "
                                                "client node ~p (=> SKIP):"
@@ -33236,8 +33235,8 @@ sc_rc_receive_response_tcp(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop client node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await client node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -34088,11 +34087,11 @@ sc_rs_send_shutdown_receive_tcp(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
-                           case start_node(Host, client) of
-                               {ok, Node} ->
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
                                    ?SEV_IPRINT("client node ~p started",
                                                [Node]),
-                                   {ok, State#{node => Node}};
+                                   {ok, State#{peer => Peer, node => Node}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -34260,8 +34259,8 @@ sc_rs_send_shutdown_receive_tcp(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop client node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await client node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -37371,11 +37370,11 @@ traffic_send_and_recv_chunks_tcp(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
-                           case start_node(Host, client) of
-                               {ok, Node} ->
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
                                    ?SEV_IPRINT("(remote) client node ~p started",
                                                [Node]),
-                                   {ok, State#{node => Node}};
+                                   {ok, State#{peer => Peer, node => Node}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -37742,8 +37741,8 @@ traffic_send_and_recv_chunks_tcp(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop client node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await client node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -39298,11 +39297,11 @@ traffic_ping_pong_send_and_receive_tcp2(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
-                           case start_node(Host, client) of
-                               {ok, Node} ->
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
                                    ?SEV_IPRINT("(remote) client node ~p started", 
                                                [Node]),
-                                   {ok, State#{node => Node}};
+                                   {ok, State#{peer => Peer, node => Node}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -39439,8 +39438,8 @@ traffic_ping_pong_send_and_receive_tcp2(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop client node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await client node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -40258,11 +40257,11 @@ traffic_ping_pong_send_and_receive_udp2(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
-                           case start_node(Host, client) of
-                               {ok, Node} ->
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
                                    ?SEV_IPRINT("(remote) client node ~p started", 
                                                [Node]),
-                                   {ok, State#{node => Node}};
+                                   {ok, State#{peer => Peer, node => Node}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -40366,8 +40365,8 @@ traffic_ping_pong_send_and_receive_udp2(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop client node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await client node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -46802,9 +46801,9 @@ ttest_tcp(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
-                           case start_node(Host, server) of
-                               {ok, Node} ->
-                                   {ok, State#{node => Node}};
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
+                                   {ok, State#{peer => Peer, node => Node}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -46882,8 +46881,8 @@ ttest_tcp(InitState) ->
                            {ok, State1}
                    end},
          #{desc => "stop (server) node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await (server) node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -46924,9 +46923,9 @@ ttest_tcp(InitState) ->
          %% *** Init part ***
          #{desc => "create node",
            cmd  => fun(#{host := Host} = State) ->
-                           case start_node(Host, client) of
-                               {ok, Node} ->
-                                   {ok, State#{node => Node}};
+                           case ?CT_PEER() of
+                               {ok, Peer, Node} ->
+                                   {ok, State#{peer => Peer, node => Node}};
                                {error, Reason} ->
                                    {skip, Reason}
                            end
@@ -47036,8 +47035,8 @@ ttest_tcp(InitState) ->
                            end
                    end},
          #{desc => "stop (client) node",
-           cmd  => fun(#{node := Node} = _State) ->
-                           stop_node(Node)
+           cmd  => fun(#{peer := Peer} = _State) ->
+                           peer:stop(Peer)
                    end},
          #{desc => "await (client) node termination",
            cmd  => fun(#{node := Node} = State) ->
@@ -48151,68 +48150,6 @@ otp16359_maccept_tcp(InitState) ->
                             Client1, Client2, Client3,
                             Tester]).
 
-
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% This mechanism has only one purpose: So that we are able to kill
-%% the node-starter process if it takes to long. The node-starter
-%% runs on the local node.
-%% This crapola is hopefully temporary, but we have seen that on
-%% some platforms the ct_slave:start simply hangs.
--define(NODE_START_TIMEOUT, 10000).
-start_node(Host, NodeName) ->
-    start_node(Host, NodeName, ?NODE_START_TIMEOUT).
-
-start_node(Host, NodeName, Timeout) ->
-    {NodeStarter, _} =
-        spawn_monitor(fun() -> exit(start_unique_node(Host, NodeName)) end),
-    receive
-        {'DOWN', _, process, NodeStarter, Result} ->
-            %% i("Node Starter (~p) reported: ~p", [NodeStarter, Result]),
-            Result
-    after Timeout ->
-            exit(NodeStarter, kill),
-            {error, {failed_starting_node, NodeName, timeout}}
-    end.
-
-start_unique_node(Host, NodeName) ->
-    UniqueNodeName = f("~w_~w", [NodeName, erlang:system_time(millisecond)]),
-    case do_start_node(Host, UniqueNodeName) of
-        {ok, _} = OK ->
-            global:sync(),
-            %% i("Node ~p started: "
-            %%    "~n   Nodes:        ~p"
-            %%    "~n   Logger:       ~p"
-            %%    "~n   Global Names: ~p",
-            %%    [NodeName, nodes(),
-            %%     global:whereis_name(socket_test_logger),
-            %%     global:registered_names()]),
-            OK;
-        {error, Reason, _} ->
-            {error, Reason}
-    end.
-
-do_start_node(Host, NodeName) when is_list(NodeName) ->
-    do_start_node(Host, list_to_atom(NodeName));
-do_start_node(Host, NodeName) when is_atom(NodeName) ->
-    Dir   = filename:dirname(code:which(?MODULE)),
-    Flags = "-pa " ++ Dir,
-    Opts  = [{monitor_master, true}, {erl_flags, Flags}],
-    ct_slave:start(Host, NodeName, Opts).
-
-
-stop_node(Node) ->
-    case ct_slave:stop(Node) of
-        {ok, _} ->
-            ok;
-        {error, _} = ERROR ->
-            ERROR
-    end.
-
-    
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 sock_open(Domain, Type, Proto) ->
diff --git a/lib/sasl/test/sasl_report_SUITE.erl b/lib/sasl/test/sasl_report_SUITE.erl
index eb0faa6316..807b2b2c53 100644
--- a/lib/sasl/test/sasl_report_SUITE.erl
+++ b/lib/sasl/test/sasl_report_SUITE.erl
@@ -95,12 +95,8 @@ gen_server_crash(Config, Encoding, FormatterOpts, Min, Max) ->
     ok = file:write_file(ConfigFileName ++ ".config",
                          io_lib:format("[{kernel, ~p},~n{sasl, ~p}].",
                                        [KernelConfig,SaslConfig])),
-    {ok,Node} =
-        test_server:start_node(
-          TC, peer,
-          [{args, ["-pa ",filename:dirname(code:which(?MODULE)),
-                   " -boot start_sasl -kernel start_timer true "
-                   "-config ",ConfigFileName]}]),
+    {ok,Peer,Node} = ?CT_PEER(["-boot", "start_sasl", "-kernel", "start_timer", "true",
+                   "-config", ConfigFileName]),
 
     %% Set depth or chars_limit.
     ok = rpc:call(Node,logger,update_formatter_config,[default,FormatterOpts]),
@@ -126,7 +122,7 @@ gen_server_crash(Config, Encoding, FormatterOpts, Min, Max) ->
     ok = rpc:call(Node,logger_std_h,filesync,[default]),
     ok = rpc:call(Node,logger_std_h,filesync,[sasl]),
 
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok = logger:remove_primary_filter(no_remote),
 
     check_file(KernelLog, utf8, Min, Max),
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 47669b3c99..78a68e2ca2 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -278,9 +278,7 @@ unicode_script(Config) when is_list(Config) ->
 
     %% Need to do this on a separate node to make sure it has unicode
     %% filename mode (+fnu*)
-    {ok,HostStr} = inet:gethostname(),
-    Host = list_to_atom(HostStr),
-    {ok,Node} = ct_slave:start(Host,unicode_script_node,[{erl_flags,"+fnui"}]),
+    {ok,Peer,Node} = ?CT_PEER(["+fnui"]),
 
     ok = rpc:call(Node,erl_tar,extract,
 		  [TarFile, [{cwd,UnicodeLibDir},compressed]]),
@@ -313,10 +311,11 @@ unicode_script(Config) when is_list(Config) ->
     rpc:call(Node,code,add_pathz,[filename:dirname(code:which(?MODULE))]),
     rpc:call(Node,?MODULE,delete_tree,[UnicodeLibDir]),
 
+    peer:stop(Peer),
+
     ok.
 
 unicode_script(cleanup,Config) ->
-    _ = ct_slave:stop(unicode_script_node),
     file:delete(fname(?privdir, "unicode_app.tgz")),
     ok.
 
diff --git a/lib/stdlib/test/gen_statem_SUITE.erl b/lib/stdlib/test/gen_statem_SUITE.erl
index b12a8c6a65..e26f9e244f 100644
--- a/lib/stdlib/test/gen_statem_SUITE.erl
+++ b/lib/stdlib/test/gen_statem_SUITE.erl
@@ -452,76 +452,64 @@ stop7(Config) ->
 
 %% Anonymous on remote node
 stop8(Config) ->
-    Node = gen_statem_stop8,
-    {ok,NodeName} = ct_slave:start(Node),
-    Statem =
-        try
-            Dir = filename:dirname(code:which(?MODULE)),
-            rpc:block_call(NodeName, code, add_path, [Dir]),
-            {ok,Pid} =
-                rpc:block_call(
-                  NodeName, gen_statem,start,
-                  [?MODULE,start_arg(Config, []),[]]),
-            ok = gen_statem:stop(Pid),
-            false = rpc:block_call(NodeName, erlang, is_process_alive, [Pid]),
-            noproc =
-                ?EXPECT_FAILURE(gen_statem:stop(Pid), Reason1),
-            Pid
-        after
-            {ok,NodeName} = ct_slave:stop(Node)
-        end,
+    {ok,Peer,NodeName} = ?CT_PEER(),
+    Dir = filename:dirname(code:which(?MODULE)),
+    rpc:block_call(NodeName, code, add_path, [Dir]),
+    {ok,Pid} =
+        rpc:block_call(
+          NodeName, gen_statem,start,
+          [?MODULE,start_arg(Config, []),[]]),
+    ok = gen_statem:stop(Pid),
+    false = rpc:block_call(NodeName, erlang, is_process_alive, [Pid]),
+    noproc =
+        ?EXPECT_FAILURE(gen_statem:stop(Pid), Reason1),
+
+    peer:stop(Peer),
     {{nodedown,NodeName},{sys,terminate,_}} =
-	?EXPECT_FAILURE(gen_statem:stop(Statem), Reason2),
+	?EXPECT_FAILURE(gen_statem:stop(Pid), Reason2),
     ok.
 
 %% Registered name on remote node
 stop9(Config) ->
     Name = to_stop,
     LocalSTM = {local,Name},
-    Node = gen_statem__stop9,
-    {ok,NodeName} = ct_slave:start(Node),
-    Statem =
-        try
-            STM = {Name,NodeName},
-            Dir = filename:dirname(code:which(?MODULE)),
-            rpc:block_call(NodeName, code, add_path, [Dir]),
-            {ok,Pid} =
-                rpc:block_call(
-                  NodeName, gen_statem, start,
-                  [LocalSTM,?MODULE,start_arg(Config, []),[]]),
-            ok = gen_statem:stop(STM),
-            undefined = rpc:block_call(NodeName,erlang,whereis,[Name]),
-            false = rpc:block_call(NodeName,erlang,is_process_alive,[Pid]),
-            noproc =
-                ?EXPECT_FAILURE(gen_statem:stop(STM), Reason1),
-            STM
-        after
-            {ok,NodeName} = ct_slave:stop(Node)
-        end,
+    {ok,Peer,NodeName} = ?CT_PEER(),
+
+    STM = {Name,NodeName},
+    Dir = filename:dirname(code:which(?MODULE)),
+    rpc:block_call(NodeName, code, add_path, [Dir]),
+    {ok,Pid} =
+        rpc:block_call(
+          NodeName, gen_statem, start,
+          [LocalSTM,?MODULE,start_arg(Config, []),[]]),
+    ok = gen_statem:stop(STM),
+    undefined = rpc:block_call(NodeName,erlang,whereis,[Name]),
+    false = rpc:block_call(NodeName,erlang,is_process_alive,[Pid]),
+    noproc =
+        ?EXPECT_FAILURE(gen_statem:stop(STM), Reason1),
+    peer:stop(Peer),
+
     {{nodedown,NodeName},{sys,terminate,_}} =
-	?EXPECT_FAILURE(gen_statem:stop(Statem), Reason2),
+	?EXPECT_FAILURE(gen_statem:stop(STM), Reason2),
     ok.
 
 %% Globally registered name on remote node
 stop10(Config) ->
-    Node = gen_statem_stop10,
     STM = {global,to_stop},
-    {ok,NodeName} = ct_slave:start(Node),
-    try
-        Dir = filename:dirname(code:which(?MODULE)),
-        rpc:block_call(NodeName,code,add_path,[Dir]),
-        {ok,Pid} =
-            rpc:block_call(
-              NodeName, gen_statem, start,
-              [STM,?MODULE,start_arg(Config, []),[]]),
-        global:sync(),
-        ok = gen_statem:stop(STM),
-        false = rpc:block_call(NodeName, erlang, is_process_alive, [Pid]),
-        noproc =
-            ?EXPECT_FAILURE(gen_statem:stop(STM), Reason1)
-    after
-        {ok,NodeName} = ct_slave:stop(Node)
-    end,
+    {ok,Peer,NodeName} = ?CT_PEER(),
+    Dir = filename:dirname(code:which(?MODULE)),
+    rpc:block_call(NodeName,code,add_path,[Dir]),
+    {ok,Pid} =
+        rpc:block_call(
+          NodeName, gen_statem, start,
+          [STM,?MODULE,start_arg(Config, []),[]]),
+    global:sync(),
+    ok = gen_statem:stop(STM),
+    false = rpc:block_call(NodeName, erlang, is_process_alive, [Pid]),
+    noproc =
+        ?EXPECT_FAILURE(gen_statem:stop(STM), Reason1),
+    peer:stop(Peer),
+
     noproc =
 	?EXPECT_FAILURE(gen_statem:stop(STM), Reason2),
     ok.
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 02da4f4ace..cd3289236d 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -58,16 +58,6 @@ end_per_group(_GroupName, Config) ->
 init_per_testcase(_,Config) ->
     Config.
 
-end_per_testcase(netload,_Config) ->
-    %% Stop slave - in case of failure
-    Nodes = nodes(),
-    case [N || N <- Nodes,
-               "make_SUITE_netload" == hd(string:lexemes(atom_to_list(N),"@"))] of
-        [Node] ->
-            ct_slave:stop(Node);
-        _ ->
-            ok
-    end;
 end_per_testcase(_,_Config) ->
     ok.
 
@@ -114,12 +104,12 @@ netload(Config) ->
     code:purge(test1),
     code:delete(test1),
     false = code:is_loaded(test1),
-    {ok,Node} = ct_slave:start(make_SUITE_netload),
+    {ok,Peer,Node} = ?CT_PEER(),
     up_to_date = make:files([test1], [netload]),
     timer:sleep(1000), % async, so give some time
     {file,F} = code:is_loaded(test1),
     {file,F} = rpc:call(Node,code,is_loaded,[test1]),
-    ct_slave:stop(Node),
+    peer:stop(Peer),
     file:set_cwd(Current),
     ensure_no_messages(),
     ok.
-- 
2.31.1

Places

File 1697-ct_slave-replace-ct_slave-with-CT_PEER.patch of Package erlang (Revision 5b89568f64d9961d3b4b7c988ecff390)

Places