File 1941-stdlib-peer-ify-application-tests.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1941-stdlib-peer-ify-application-tests.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Currently displaying revision 0e04b8d79a55adf8ba49c177393a4846 , Show latest

From c6498930285d96faff64a845370badf600b6fe98 Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <maximfca@gmail.com>
Date: Thu, 18 Nov 2021 19:57:14 -0800
Subject: [PATCH] [stdlib] peer-ify application tests

Replace usage of `test_server:start_node` with `?CT_PEER`.
Additionally, disable local_time_to_universal_time_dst when running
outside of MET/CET (otherwise it inevitably fails), and fix tar_SUITE
test that fails when `compile` module is taken from the installed
system (in that case compile.beam would be read-only, and after
un-tarring mode will be read-write, making this test fail).
---
 lib/stdlib/test/calendar_SUITE.erl       | 12 +++---
 lib/stdlib/test/dets_SUITE.erl           | 24 ++++--------
 lib/stdlib/test/epp_SUITE.erl            | 17 +++------
 lib/stdlib/test/erl_pp_SUITE.erl         | 17 +++------
 lib/stdlib/test/error_logger_h_SUITE.erl | 18 ++-------
 lib/stdlib/test/ets_SUITE.erl            | 11 +-----
 lib/stdlib/test/gen_fsm_SUITE.erl        | 12 +++---
 lib/stdlib/test/gen_server_SUITE.erl     | 46 +++++++++++------------
 lib/stdlib/test/io_SUITE.erl             | 47 +++++++++---------------
 lib/stdlib/test/pool_SUITE.erl           | 17 +++++----
 lib/stdlib/test/proc_lib_SUITE.erl       |  4 +-
 lib/stdlib/test/qlc_SUITE.erl            |  8 +---
 lib/stdlib/test/shell_SUITE.erl          | 39 +++++++-------------
 lib/stdlib/test/tar_SUITE.erl            | 26 +++----------
 14 files changed, 110 insertions(+), 188 deletions(-)

diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index c39da41ae9..dff3761cc6 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_SUITE.erl
@@ -112,21 +112,23 @@ leap_years(Config) when is_list(Config) ->
 last_day_of_the_month(Config) when is_list(Config) ->
     check_last_day_of_the_month({?START_YEAR, 1}, {?END_YEAR, 1}).
 
-%% Tests local_time_to_universal_time_dst for MET.
+%% Tests local_time_to_universal_time_dst for CET/CEST/MET/MEST.
 local_time_to_universal_time_dst(Config) when is_list(Config) ->
     case os:type() of
 	{unix,_} ->
 	    case os:cmd("date '+%Z'") of
-		"SAST"++_ ->
-		    {comment, "Spoky time zone with zero-set DST, skipped"};
+                "ME"++_ -> %% covers MET/MEST
+                    local_time_to_universal_time_dst_x(Config);
+                "CE"++_ -> %% covers CET/CEST
+                    local_time_to_universal_time_dst_x(Config);
 		_ ->
-		    local_time_to_universal_time_dst_x(Config)
+                    {skip, "This test runs only for MET/MEST/CET/CEST"}
 	    end;
 	_ ->
 	    local_time_to_universal_time_dst_x(Config)
     end.
 local_time_to_universal_time_dst_x(Config) when is_list(Config) ->
-    %% Assumes MET (UTC+1 / UTC+2(dst)
+    %% Assumes CET (UTC+1 / UTC+2(dst) or MET (same as CET)
     LtW   = {{2003,01,15},{14,00,00}}, % Winter
     UtW   = {{2003,01,15},{13,00,00}}, %
     UtWd  = {{2003,01,15},{12,00,00}}, % dst
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index e77ee36eb1..a2e15ac935 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -115,9 +115,9 @@ end_per_group(_GroupName, Config) ->
 %% OTP-3621
 newly_started(Config) when is_list(Config) ->
     true = is_alive(),
-    {ok, Node} = test_server:start_node(slave1, slave, []),
+    {ok, Peer, Node} = ?CT_PEER(),
     [] = rpc:call(Node, dets, all, []),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 basic(Config) when is_list(Config) ->
@@ -153,7 +153,7 @@ open(Config) when is_list(Config) ->
     %% Running this test twice means that the Dets server is restarted
     %% twice. dets_sup specifies a maximum of 4 restarts in an hour.
     %% If this becomes a problem, one should consider running this
-    %% test on a slave node.
+    %% test on a peer node.
 
     {Sets, Bags, Dups} = args(Config),
     
@@ -373,12 +373,7 @@ dirty_mark(Config) when is_list(Config) ->
 			   exit(other_process_dead)
 		   end
 	   end,
-    {ok, Node} = test_server:start_node(dets_dirty_mark,
-                                        slave,
-                                        [{linked, false},
-                                         {args, "-pa " ++
-                                              filename:dirname
-						(code:which(?MODULE))}]),
+    {ok, Peer, Node} = ?CT_PEER(),
     ok = ensure_node(20, Node),
     %% io:format("~p~n",[rpc:call(Node, code, get_path, [])]),
     %% io:format("~p~n",[rpc:call(Node, file, get_cwd, [])]),
@@ -387,7 +382,7 @@ dirty_mark(Config) when is_list(Config) ->
 			 [?MODULE, dets_dirty_loop, []]),
     {ok, Tab} = Call(Pid, [open, Tab, [{file, FName}]]),
     [{opel,germany}] = Call(Pid, [read,Tab,opel]),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     {ok, Tab} = dets:open_file(Tab,[{file, FName},
                                     {repair,false}]),
     ok = dets:close(Tab),
@@ -421,12 +416,7 @@ dirty_mark2(Config) when is_list(Config) ->
 			   exit(other_process_dead)
 		   end
 	   end,
-    {ok, Node} = test_server:start_node(dets_dirty_mark2,
-                                        slave,
-                                        [{linked, false},
-                                         {args, "-pa " ++
-                                              filename:dirname
-						(code:which(?MODULE))}]),
+    {ok, Peer, Node} = ?CT_PEER(),
     ok = ensure_node(20, Node),
     Pid = rpc:call(Node,erlang, spawn,
                    [?MODULE, dets_dirty_loop, []]),
@@ -435,7 +425,7 @@ dirty_mark2(Config) when is_list(Config) ->
     timer:sleep(2100),
     %% Read something, just to give auto save time to finish.
     [{opel,germany}] = Call(Pid, [read,Tab,opel]),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     {ok, Tab} = dets:open_file(Tab, [{file, FName}, {repair,false}]),
     ok = dets:close(Tab),
     file:delete(FName),
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl
index ae4ca3cd2c..bce8771b81 100644
--- a/lib/stdlib/test/epp_SUITE.erl
+++ b/lib/stdlib/test/epp_SUITE.erl
@@ -1530,20 +1530,20 @@ otp_10820(Config) when is_list(Config) ->
     Dir = proplists:get_value(priv_dir, Config),
     File = filename:join(Dir, L++".erl"),
     C1 = <<"%% coding: utf-8\n -module(any).">>,
-    ok = do_otp_10820(File, C1, "+pc latin1"),
-    ok = do_otp_10820(File, C1, "+pc unicode"),
+    ok = do_otp_10820(File, C1, ["+pc", "latin1"]),
+    ok = do_otp_10820(File, C1, ["+pc", "unicode"]),
     C2 = <<"\n-module(any).">>,
-    ok = do_otp_10820(File, C2, "+pc latin1"),
-    ok = do_otp_10820(File, C2, "+pc unicode").
+    ok = do_otp_10820(File, C2, ["+pc", "latin1"]),
+    ok = do_otp_10820(File, C2, ["+pc", "unicode"]).
 
 do_otp_10820(File, C, PC) ->
-    {ok,Node} = start_node(erl_pp_helper, "+fnu " ++ PC),
+    {ok,Peer,Node} = ?CT_PEER(["+fnu"] ++ PC),
     ok = rpc:call(Node, file, write_file, [File, C]),
     {ok, Forms} = rpc:call(Node, epp, parse_file, [File, [],[]]),
     [{attribute,1,file,{File,1}},
      {attribute,2,module,any},
      {eof,2}] = unopaque_forms(Forms),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 %% OTP_14285: Unicode atoms.
@@ -2117,8 +2117,3 @@ fail() ->
 
 message_compare(T, T) ->
     T =:= T.
-
-%% +fnu means a peer node has to be started; slave will not do
-start_node(Name, Xargs) ->
-    PA = filename:dirname(code:which(?MODULE)),
-    test_server:start_node(Name, peer, [{args, "-pa " ++ PA ++ " " ++ Xargs}]).
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl
index bbca63c796..24299e848d 100644
--- a/lib/stdlib/test/erl_pp_SUITE.erl
+++ b/lib/stdlib/test/erl_pp_SUITE.erl
@@ -1118,14 +1118,14 @@ unicode_hook({foo,E}, I, P, H) ->
 %% OTP-10820. Unicode filenames.
 otp_10820(Config) when is_list(Config) ->
     C1 = <<"%% coding: utf-8\n -module(any).">>,
-    ok = do_otp_10820(Config, C1, "+pc latin1"),
-    ok = do_otp_10820(Config, C1, "+pc unicode"),
+    ok = do_otp_10820(Config, C1, ["+pc", "latin1"]),
+    ok = do_otp_10820(Config, C1, ["+pc", "unicode"]),
     C2 = <<"%% coding: latin-1\n -module(any).">>,
-    ok = do_otp_10820(Config, C2, "+pc latin1"),
-    ok = do_otp_10820(Config, C2, "+pc unicode").
+    ok = do_otp_10820(Config, C2, ["+pc", "latin1"]),
+    ok = do_otp_10820(Config, C2, ["+pc", "unicode"]).
 
 do_otp_10820(Config, C, PC) ->
-    {ok,Node} = start_node(erl_pp_helper, "+fnu " ++ PC),
+    {ok,Peer,Node} = ?CT_PEER(["+fnu"] ++ PC),
     L = [915,953,959,973,957,953,954,959,957,964],
     FileName = filename(L++".erl", Config),
     ok = rpc:call(Node, file, write_file, [FileName, C]),
@@ -1133,7 +1133,7 @@ do_otp_10820(Config, C, PC) ->
                             [FileName, [return,'P',{outdir,?privdir}]]),
     PFileName = filename(L++".P", Config),
     {ok, Bin} = rpc:call(Node, file, read_file, [PFileName]),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     true = file_attr_is_string(binary_to_list(Bin)),
     ok.
 
@@ -1559,11 +1559,6 @@ filename(Name, Config) ->
 fail() ->
     ct:fail(failed).
 
-%% +fnu means a peer node has to be started; slave will not do
-start_node(Name, Xargs) ->
-    PA = filename:dirname(code:which(?MODULE)),
-    test_server:start_node(Name, peer, [{args, "-pa " ++ PA ++ " " ++ Xargs}]).
-
 assert_same(Expected) when is_list(Expected) ->
     Actual = binary_to_list(iolist_to_binary(parse_and_pp_forms(Expected, []))),
     case Expected == Actual of
diff --git a/lib/stdlib/test/error_logger_h_SUITE.erl b/lib/stdlib/test/error_logger_h_SUITE.erl
index bf9b6d9ad6..89db16a899 100644
--- a/lib/stdlib/test/error_logger_h_SUITE.erl
+++ b/lib/stdlib/test/error_logger_h_SUITE.erl
@@ -57,8 +57,7 @@ logfile(Config) ->
 
     do_one_logfile(Log, Ev, unlimited),
 
-    Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    {ok,Node} = start_node(logfile, Pa),
+    {ok,Peer,Node} = ?CT_PEER(),
     error_logger:logfile({open,Log}),
     ok = rpc:call(Node, erlang, apply, [fun gen_events/1,[Ev]]),
     AtNode = iolist_to_binary(["** at node ",atom_to_list(Node)," **"]),
@@ -79,7 +78,7 @@ logfile(Config) ->
                    end
            end, processes()),
 
-    test_server:stop_node(Node),
+    peer:stop(Peer),
 
     cleanup(Log),
     ok.
@@ -119,8 +118,7 @@ tty(Config) ->
 
     do_one_tty(Log, Ev, unlimited),
 
-    Pa = "-pa " ++ filename:dirname(code:which(?MODULE)),
-    {ok,Node} = start_node(tty, Pa),
+    {ok,Peer,Node} = ?CT_PEER(),
     tty_log_open(Log),
     ok = rpc:call(Node, erlang, apply, [fun gen_events/1,[Ev]]),
     tty_log_close(),
@@ -128,7 +126,7 @@ tty(Config) ->
     timer:sleep(1000), % some time get all log events in the log
     analyse_events(Log, Ev, [AtNode], unlimited),
 
-    test_server:stop_node(Node),
+    peer:stop(Peer),
 
     cleanup(Log),
     ok.
@@ -339,14 +337,6 @@ match_head(Tag, Head) ->
 	   "\\d\\d:\\d\\d:\\d\\d ===$">>,
     {match,_} = re:run(Head, Re).
 
-start_node(Name, Args) ->
-    case test_server:start_node(Name, slave, [{args,Args}]) of
-	{ok,Node} ->
-	    {ok,Node};
-	Error  ->
-	    ct:fail(Error)
-    end.
-
 cleanup(File) ->
     %% The point of this test case is not to test file operations.
     %% Therefore ignore any failures.
diff --git a/lib/stdlib/test/ets_SUITE.erl b/lib/stdlib/test/ets_SUITE.erl
index dc709fc11c..1470e3f8a7 100644
--- a/lib/stdlib/test/ets_SUITE.erl
+++ b/lib/stdlib/test/ets_SUITE.erl
@@ -5247,13 +5247,13 @@ test_delete_table_while_size_snapshot(Config) when is_list(Config) ->
     %% Run test case in a slave node as other test suites in stdlib
     %% depend on that pids are ordered in creation order which is no
     %% longer the case when many processes have been started before
-    Node = start_slave(),
+    {ok, Peer, Node} = ?CT_PEER(),
     [ok = rpc:call(Node,
                    ?MODULE,
                    test_delete_table_while_size_snapshot_helper,
                    [TableType])
      || TableType <- [set, ordered_set]],
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 test_delete_table_while_size_snapshot_helper(TableType) ->
@@ -5290,13 +5290,6 @@ size_process(Table, Parent) ->
         E -> Parent ! {got_unexpected_exception, E}
     end.
 
-start_slave() ->
-    MicroSecs = erlang:monotonic_time(),
-    Name = "ets_" ++ integer_to_list(MicroSecs),
-    Pa = filename:dirname(code:which(?MODULE)),
-    {ok, Node} = test_server:start_node(list_to_atom(Name), slave, [{args, "-pa " ++ Pa}]),
-    Node.
-
 repeat_par(FunToRepeat, NrOfTimes) ->
     repeat_par_help(FunToRepeat, NrOfTimes, NrOfTimes).
 
diff --git a/lib/stdlib/test/gen_fsm_SUITE.erl b/lib/stdlib/test/gen_fsm_SUITE.erl
index e08065c170..129815eeca 100644
--- a/lib/stdlib/test/gen_fsm_SUITE.erl
+++ b/lib/stdlib/test/gen_fsm_SUITE.erl
@@ -366,20 +366,20 @@ stop7(_Config) ->
 
 %% Anonymous on remote node
 stop8(_Config) ->
-    {ok,Node} = test_server:start_node(gen_fsm_SUITE_stop8,slave,[]),
+    {ok,Peer,Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_fsm,start,[?MODULE,[],[]]),
     ok = gen_fsm:stop(Pid),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_fsm:stop(Pid)),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     {'EXIT',{{nodedown,Node},_}} = (catch gen_fsm:stop(Pid)),
     ok.
 
 %% Registered name on remote node
 stop9(_Config) ->
-    {ok,Node} = test_server:start_node(gen_fsm_SUITE_stop9,slave,[]),
+    {ok,Peer,Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_fsm,start,[{local,to_stop},?MODULE,[],[]]),
@@ -387,13 +387,13 @@ stop9(_Config) ->
     undefined = rpc:call(Node,erlang,whereis,[to_stop]),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_fsm:stop({to_stop,Node})),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     {'EXIT',{{nodedown,Node},_}} = (catch gen_fsm:stop({to_stop,Node})),
     ok.
 
 %% Globally registered name on remote node
 stop10(_Config) ->
-    {ok,Node} = test_server:start_node(gen_fsm_SUITE_stop10,slave,[]),
+    {ok,Peer,Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_fsm,start,[{global,to_stop},?MODULE,[],[]]),
@@ -401,7 +401,7 @@ stop10(_Config) ->
     ok = gen_fsm:stop({global,to_stop}),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_fsm:stop({global,to_stop})),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     {'EXIT',noproc} = (catch gen_fsm:stop({global,to_stop})),
     ok.
 
diff --git a/lib/stdlib/test/gen_server_SUITE.erl b/lib/stdlib/test/gen_server_SUITE.erl
index 555784de8c..b0cd3ad600 100644
--- a/lib/stdlib/test/gen_server_SUITE.erl
+++ b/lib/stdlib/test/gen_server_SUITE.erl
@@ -117,18 +117,19 @@ init_per_testcase(Case, Config) when Case == call_remote1;
 				     Case == call_remote_n2;
 				     Case == call_remote_n3;
                                      Case == send_request ->
-    {ok,N} = start_node(hubba),
-    [{node,N} | Config];
+    {ok,Peer,Node} = ?CT_PEER(),
+    ok = global:sync(),
+    [{node,Node}, {peer, Peer} | Config];
 
 init_per_testcase(_Case, Config) ->
     Config.
 
 end_per_testcase(_Case, Config) ->
-    case proplists:get_value(node, Config) of
+    case proplists:get_value(peer, Config) of
 	undefined ->
 	    ok;
-	N ->
-	    test_server:stop_node(N)
+	Peer ->
+	    peer:stop(Peer)
     end,
     ok.
 
@@ -372,20 +373,20 @@ stop7(_Config) ->
 
 %% Anonymous on remote node
 stop8(_Config) ->
-    {ok,Node} = test_server:start_node(gen_server_SUITE_stop8,slave,[]),
+    {ok,Peer,Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_server,start,[?MODULE,[],[]]),
     ok = gen_server:stop(Pid),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_server:stop(Pid)),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     {'EXIT',{{nodedown,Node},_}} = (catch gen_server:stop(Pid)),
     ok.
 
 %% Registered name on remote node
 stop9(_Config) ->
-    {ok,Node} = test_server:start_node(gen_server_SUITE_stop9,slave,[]),
+    {ok,Peer,Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_server,start,[{local,to_stop},?MODULE,[],[]]),
@@ -393,13 +394,13 @@ stop9(_Config) ->
     undefined = rpc:call(Node,erlang,whereis,[to_stop]),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_server:stop({to_stop,Node})),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     {'EXIT',{{nodedown,Node},_}} = (catch gen_server:stop({to_stop,Node})),
     ok.
 
 %% Globally registered name on remote node
 stop10(_Config) ->
-    {ok,Node} = test_server:start_node(gen_server_SUITE_stop10,slave,[]),
+    {ok,Peer,Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     {ok, Pid} = rpc:call(Node,gen_server,start,[{global,to_stop},?MODULE,[],[]]),
@@ -407,7 +408,7 @@ stop10(_Config) ->
     ok = gen_server:stop({global,to_stop}),
     false = rpc:call(Node,erlang,is_process_alive,[Pid]),
     {'EXIT',noproc} = (catch gen_server:stop({global,to_stop})),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     {'EXIT',noproc} = (catch gen_server:stop({global,to_stop})),
     ok.
 
@@ -643,15 +644,6 @@ read_replies() ->
 %% Test call to nonexisting processes on remote nodes
 %% --------------------------------------
 
-start_node(Name) ->
-    Pa = filename:dirname(code:which(?MODULE)),
-    N = test_server:start_node(Name, slave, [{args, " -pa " ++ Pa}]),
-    %% After starting a slave, it takes a little while until global knows
-    %% about it, even if nodes() includes it, so we make sure that global
-    %% knows about it before registering something on all nodes.
-    ok = global:sync(),
-    N.
-
 call_remote1(Config) when is_list(Config) ->
     N = hubba,
     Node = proplists:get_value(node,Config),
@@ -698,7 +690,7 @@ call_remote_n1(Config) when is_list(Config) ->
     Node = proplists:get_value(node,Config),
     {ok, _Pid} = rpc:call(Node, gen_server, start,
 			  [{global, N}, ?MODULE, [], []]),
-    _ = test_server:stop_node(Node),
+    peer:stop(proplists:get_value(peer,Config)),
     {'EXIT', {noproc, _}} =
 	(catch gen_server:call({global, N}, started_p, infinity)),
 
@@ -710,7 +702,7 @@ call_remote_n2(Config) when is_list(Config) ->
 
     {ok, Pid} = rpc:call(Node, gen_server, start,
 			 [{global, N}, ?MODULE, [], []]),
-    _ = test_server:stop_node(Node),
+    peer:stop(proplists:get_value(peer,Config)),
     {'EXIT', {{nodedown, Node}, _}} = (catch gen_server:call(Pid,
 							     started_p, infinity)),
 
@@ -721,7 +713,7 @@ call_remote_n3(Config) when is_list(Config) ->
 
     {ok, _Pid} = rpc:call(Node, gen_server, start,
 			  [{local, piller}, ?MODULE, [], []]),
-    _ = test_server:stop_node(Node),
+    peer:stop(proplists:get_value(peer,Config)),
     {'EXIT', {{nodedown, Node}, _}} = (catch gen_server:call({piller, Node},
 							     started_p, infinity)),
 
@@ -776,7 +768,11 @@ cast(Config) when is_list(Config) ->
 
 %% Test that cast really return immediately.
 cast_fast(Config) when is_list(Config) ->
-    {ok,Node} = start_node(hubba),
+    {ok,Peer,Node} = ?CT_PEER(),
+    %% After starting a slave, it takes a little while until global knows
+    %% about it, even if nodes() includes it, so we make sure that global
+    %% knows about it before registering something on all nodes.
+    ok = global:sync(),
     {_,"@"++Host} = lists:splitwith(fun ($@) -> false; (_) -> true end,
 				    atom_to_list(Node)),
     FalseNode = list_to_atom("hopp@"++Host),
@@ -786,7 +782,7 @@ cast_fast(Config) when is_list(Config) ->
     {Time,ok} = timer:tc(fun() ->
 				 gen_server:cast({hopp,FalseNode}, hopp)
 			 end),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     if Time > 1000000 ->       % Default listen timeout is about 7.0 s
 	    ct:fail(hanging_cast);
        true ->
diff --git a/lib/stdlib/test/io_SUITE.erl b/lib/stdlib/test/io_SUITE.erl
index 81233799b2..af2990cb83 100644
--- a/lib/stdlib/test/io_SUITE.erl
+++ b/lib/stdlib/test/io_SUITE.erl
@@ -1970,22 +1970,16 @@ io_lib_fread_literal(Suite) when is_list(Suite) ->
 
 %% Check that the printable range set by the user actually works.
 printable_range(Suite) when is_list(Suite) ->
-    Pa = filename:dirname(code:which(?MODULE)),
-    {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
-					 [{args, " +pc unicode -pa " ++ Pa}]),
-    {ok, LNode} = test_server:start_node(printable_range_latin1, slave,
-					 [{args, " +pc latin1 -pa " ++ Pa}]),
-    {ok, DNode} = test_server:start_node(printable_range_default, slave,
-					 [{args, " -pa " ++ Pa}]),
-    unicode = rpc:call(UNode,io,printable_range,[]),
-    latin1 = rpc:call(LNode,io,printable_range,[]),
+    {ok, UPeer0, UNode0} = ?CT_PEER(["+pc", "unicode"]),
+    {ok, LPeer0, LNode0} = ?CT_PEER(["+pc", "latin1"]),
+    {ok, DPeer, DNode} = ?CT_PEER(),
+    unicode = rpc:call(UNode0,io,printable_range,[]),
+    latin1 = rpc:call(LNode0,io,printable_range,[]),
     latin1 = rpc:call(DNode,io,printable_range,[]),
-    test_server:stop_node(UNode),
-    test_server:stop_node(LNode),
-    {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
-					 [{args, " +pcunicode -pa " ++ Pa}]),
-    {ok, LNode} = test_server:start_node(printable_range_latin1, slave,
-					 [{args, " +pclatin1 -pa " ++ Pa}]),
+    peer:stop(UPeer0),
+    peer:stop(LPeer0),
+    {ok, UPeer, UNode} = ?CT_PEER(["+pcunicode"]),
+    {ok, LPeer, LNode} = ?CT_PEER(["+pclatin1"]),
     unicode = rpc:call(UNode,io,printable_range,[]),
     latin1 = rpc:call(LNode,io,printable_range,[]),
     PrettyOptions = [{column,1},
@@ -2033,9 +2027,9 @@ printable_range(Suite) when is_list(Suite) ->
     $\e = format_max(LNode, ["~ts", [PrintableControls]]),
     $\e = format_max(DNode, ["~ts", [PrintableControls]]),
 
-    test_server:stop_node(UNode),
-    test_server:stop_node(LNode),
-    test_server:stop_node(DNode),
+    peer:stop(UPeer),
+    peer:stop(LPeer),
+    peer:stop(DPeer),
     ok.
 
 print_max(Node, Args) ->
@@ -2083,11 +2077,8 @@ io_lib_print_binary_depth_one(Suite) when is_list(Suite) ->
 
 %% OTP-10302. Unicode.
 otp_10302(Suite) when is_list(Suite) ->
-    Pa = filename:dirname(code:which(?MODULE)),
-    {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
-					 [{args, " +pc unicode -pa " ++ Pa}]),
-    {ok, LNode} = test_server:start_node(printable_range_latin1, slave,
-					 [{args, " +pc latin1 -pa " ++ Pa}]),
+    {ok, UPeer, UNode} = ?CT_PEER(["+pc", "unicode"]),
+    {ok, LPeer, LNode} = ?CT_PEER(["+pc", "latin1"]),
     "\"\x{400}\"" = rpc:call(UNode,?MODULE,pretty,["\x{400}", -1]),
     "<<\"\x{400}\"/utf8>>" = rpc:call(UNode,?MODULE,pretty,
 				      [<<"\x{400}"/utf8>>, -1]),
@@ -2098,8 +2089,8 @@ otp_10302(Suite) when is_list(Suite) ->
     "<<208,128>>" = rpc:call(LNode,?MODULE,pretty,[<<"\x{400}"/utf8>>, -1]),
 
     "<<208,...>>" = rpc:call(LNode,?MODULE,pretty,[<<"\x{400}foo"/utf8>>, 2]),
-    test_server:stop_node(UNode),
-    test_server:stop_node(LNode),
+    peer:stop(UPeer),
+    peer:stop(LPeer),
 
     "<<\"äppl\"/utf8>>" = pretty(<<"äppl"/utf8>>, 2),
     "<<\"äppl\"/utf8...>>" = pretty(<<"äpple"/utf8>>, 2),
@@ -2744,9 +2735,7 @@ trunc_string() ->
     "str str" = trf("str ~s", ["str"], 7),
     "str str" = trf("str ~8s", ["str"], 6),
     "str ..." = trf("str ~8s", ["str1"], 6),
-    Pa = filename:dirname(code:which(?MODULE)),
-    {ok, UNode} = test_server:start_node(printable_range_unicode, slave,
-					 [{args, " +pc unicode -pa " ++ Pa}]),
+    {ok, UPeer, UNode} = ?CT_PEER(["+pc", "unicode"]),
     U = "кирилли́ческий атом",
     UFun = fun(Format, Args, CharsLimit) ->
                    rpc:call(UNode,
@@ -2764,7 +2753,7 @@ trunc_string() ->
     "<<\"кирилли́\"/utf8...>>" = UFun("~tp", [BU], 20),
     "<<\"кирилли́\"/utf8...>>" = UFun("~tp", [BU], 21),
     "<<\"кирилли́ческ\"/utf8...>>" = UFun("~tp", [BU], 22),
-    test_server:stop_node(UNode).
+    peer:stop(UPeer).
 
 trunc_depth(D, Fun) ->
     "..." = Fun("", D, 0),
diff --git a/lib/stdlib/test/pool_SUITE.erl b/lib/stdlib/test/pool_SUITE.erl
index 618d71f6c4..f2bd3c0ce2 100644
--- a/lib/stdlib/test/pool_SUITE.erl
+++ b/lib/stdlib/test/pool_SUITE.erl
@@ -23,6 +23,8 @@
 	 init_per_group/2,end_per_group/2]).
 -export([basic/1, link_race/1, echo/1]).
 
+-include_lib("common_test/include/ct.hrl").
+
 suite() -> [{ct_hooks,[{ts_install_cth,[{nodenames, 1}]}]}].
 
 all() ->
@@ -45,7 +47,7 @@ end_per_group(_GroupName, Config) ->
 
 basic(Config) ->
 
-    {ok, Node, PoolNode} = init_pool(pool_SUITE_basic, basic, Config),
+    {ok, Peer, Node, PoolNode} = init_pool(?FUNCTION_NAME, basic, Config),
 
     Node = rpc:call(Node, pool, get_node, []),
     PoolNode = rpc:call(Node, pool, get_node, []),
@@ -53,19 +55,19 @@ basic(Config) ->
     do_echo(Node),
     do_echo(Node),
 
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 link_race(Config) ->
 
-    {ok, Node, PoolNode} = init_pool(pool_SUITE_basic, basic, Config),
+    {ok, Peer, Node, PoolNode} = init_pool(?FUNCTION_NAME, basic, Config),
 
     Node = rpc:call(Node, pool, get_node, []),
     PoolNode = rpc:call(Node, pool, get_node, []),
 
     rpc:call(Node, pool, pspawn_link, [erlang, is_atom, [?MODULE]]),
 
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 do_echo(Node) ->
@@ -79,10 +81,9 @@ echo(Parent) ->
     end.
 
 
-init_pool(Proxy, Name, Config) ->
+init_pool(Case, Name, Config) ->
     PrivDir = proplists:get_value(priv_dir, Config),
-    [Slave] = proplists:get_value(nodenames, Config),
-    {ok, Node} = test_server:start_node(Proxy, slave, []),
+    {ok, Peer, Node} = ?CT_PEER(#{name => Case}),
     {ok, Hostname} = inet:gethostname(),
     file:write_file(filename:join(PrivDir,".hosts.erlang"),"'"++Hostname++"'.\n"),
     ok = rpc:call(Node, file, set_cwd, [PrivDir]),
@@ -92,4 +93,4 @@ init_pool(Proxy, Name, Config) ->
     Nodes = rpc:call(Node, pool, get_nodes, []),
     [rpc:call(N, code, add_patha, [filename:dirname(code:which(?MODULE))]) || N <- Nodes],
 
-    {ok, Node, PoolNode}.
+    {ok, Peer, Node, PoolNode}.
diff --git a/lib/stdlib/test/proc_lib_SUITE.erl b/lib/stdlib/test/proc_lib_SUITE.erl
index 33109e93ad..afef5fda7b 100644
--- a/lib/stdlib/test/proc_lib_SUITE.erl
+++ b/lib/stdlib/test/proc_lib_SUITE.erl
@@ -700,7 +700,7 @@ stop(_Config) ->
     false = erlang:is_process_alive(Pid7),
 
     %% Remote registered name
-    {ok,Node} = test_server:start_node(proc_lib_SUITE_stop,slave,[]),
+    {ok, Peer, Node} = ?CT_PEER(),
     Dir = filename:dirname(code:which(?MODULE)),
     rpc:call(Node,code,add_path,[Dir]),
     Pid8 = spawn(Node,SysMsgProc),
@@ -714,7 +714,7 @@ stop(_Config) ->
     {'EXIT',noproc} = (catch proc_lib:stop(to_stop)),
     {'EXIT',noproc} = (catch proc_lib:stop({to_stop,Node})),
 
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
 
     %% Remote registered name, but non-existing node
     {'EXIT',{{nodedown,Node},_}} = (catch proc_lib:stop({to_stop,Node})),
diff --git a/lib/stdlib/test/qlc_SUITE.erl b/lib/stdlib/test/qlc_SUITE.erl
index 827af0bb18..3ab1c50332 100644
--- a/lib/stdlib/test/qlc_SUITE.erl
+++ b/lib/stdlib/test/qlc_SUITE.erl
@@ -1163,9 +1163,9 @@ append(Config) when is_list(Config) ->
 evaluator(Config) when is_list(Config) ->
     true = is_alive(),
     evaluator_2(Config, []),
-    {ok, Node} = start_node(qlc_SUITE_evaluator),
+    {ok, Peer, Node} = ?CT_PEER(),
     ok = rpc:call(Node, ?MODULE, evaluator_2, [Config, [compiler]]),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 evaluator_2(Config, Apps) ->
@@ -1191,10 +1191,6 @@ evaluator_2(Config, Apps) ->
     _ = file:delete(FileName),
     ok.
 
-start_node(Name) ->
-    PA = filename:dirname(code:which(?MODULE)),
-    test_server:start_node(Name, slave, [{args, "-pa " ++ PA}]).
-
 %% string_to_handle/1,2.
 string_to_handle(Config) when is_list(Config) ->
     {'EXIT',{badarg,_}} = (catch qlc:string_to_handle(14)),
diff --git a/lib/stdlib/test/shell_SUITE.erl b/lib/stdlib/test/shell_SUITE.erl
index 41cac50008..eaa8cf136d 100644
--- a/lib/stdlib/test/shell_SUITE.erl
+++ b/lib/stdlib/test/shell_SUITE.erl
@@ -190,16 +190,15 @@ ok.
 
 %% Check restricted shell when started from the command line.
 start_restricted_on_command_line(Config) when is_list(Config) ->
-    {ok,Node} = start_node(shell_suite_helper_1,
-			   "-pa "++proplists:get_value(priv_dir,Config)++
-			       " -stdlib restricted_shell foo"),
+    {ok, Peer, Node} = ?CT_PEER(["-pa", proplists:get_value(priv_dir,Config),
+			         "-stdlib", "restricted_shell", "foo"]),
     "Warning! Restricted shell module foo not found: nofile"++_ =
 	t({Node, <<"begin m() end.">>}),
     "exception exit: restricted shell does not allow m()" =
 	comm_err({Node, <<"begin m() end.">>}),
     [ok] =
 	(catch scan({Node, <<"begin q() end.">>})),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     Test = filename:join(proplists:get_value(priv_dir, Config),
 			       "test_restricted2.erl"),
     Contents = <<"-module(test_restricted2).
@@ -217,9 +216,8 @@ start_restricted_on_command_line(Config) when is_list(Config) ->
                       {false,State}.
                  ">>,
     ok = compile_file(Config, Test, Contents, []),
-    {ok,Node2} = start_node(shell_suite_helper_2,
-				 "-pa "++proplists:get_value(priv_dir,Config)++
-				 " -stdlib restricted_shell test_restricted2"),
+    {ok, Peer2, Node2} = ?CT_PEER(["-pa", proplists:get_value(priv_dir,Config),
+				  "-stdlib", "restricted_shell", "test_restricted2"]),
     "Module" ++ _ = t({Node2,<<"begin m() end.">>, utf8}),
     "exception exit: restricted shell does not allow c(foo)" =
 	comm_err({Node2,<<"begin c(foo) end.">>}),
@@ -235,7 +233,7 @@ start_restricted_on_command_line(Config) when is_list(Config) ->
 	comm_err({Node2,<<"begin shell:stop_restricted() end.">>}),
     [ok] =
 	scan({Node2, <<"begin q() end.">>}),
-    test_server:stop_node(Node2),
+    peer:stop(Peer2),
     ok.
 
 %% Tests calling local shell functions with spectacular arguments in
@@ -661,15 +659,11 @@ otp_5435(Config) when is_list(Config) ->
     true = <<103133.0:64/float>> =:=
         evaluate(<<"<<103133.0:64/float>> = <<103133:64/float>>.">>, []),
     true = is_alive(),
-    {ok, Node} = start_node(shell_SUITE_otp_5435),
+    {ok, Peer, Node} = ?CT_PEER(),
     ok = rpc:call(Node, ?MODULE, otp_5435_2, []),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
-start_node(Name) ->
-    PA = filename:dirname(code:which(?MODULE)),
-    test_server:start_node(Name, slave, [{args, "-pa " ++ PA}]).
-
 otp_5435_2() ->
     true = code:del_path(compiler),
     %% Make sure record evaluation is not dependent on the compiler
@@ -2750,9 +2744,8 @@ prompt_err(B) ->
 
 %% OTP-10302. Unicode. Also OTP-14285, Unicode atoms.
 otp_10302(Config) when is_list(Config) ->
-    {ok,Node} = start_node(shell_suite_helper_2,
-			   "-pa "++proplists:get_value(priv_dir,Config)++
-			   " +pc unicode"),
+    {ok, Peer, Node} = ?CT_PEER(["-pa", proplists:get_value(priv_dir,Config),
+			         "+pc", "unicode"]),
     Test1 =
         <<"begin
                io:setopts([{encoding,utf8}]),
@@ -2902,7 +2895,7 @@ otp_10302(Config) when is_list(Config) ->
     "ok.\n** exception error: undefined function "
     "shell_SUITE:'\x{447}\x{435}'/0.\n" =
         t({Node,Test17}),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 otp_13719(Config) when is_list(Config) ->
@@ -2919,9 +2912,8 @@ otp_13719(Config) when is_list(Config) ->
     ok.
 
 otp_14285(Config) ->
-    {ok,Node} = start_node(shell_suite_helper_4,
-			   "-pa "++proplists:get_value(priv_dir,Config)++
-			   " +pc unicode"),
+    {ok, Peer, Node} = ?CT_PEER(["-pa", proplists:get_value(priv_dir,Config),
+        "+pc", "unicode"]),
     Test1 =
         <<"begin
                io:setopts([{encoding,utf8}]),
@@ -2931,7 +2923,7 @@ otp_14285(Config) ->
            end.">>,
     "-record('\x{400}',{'\x{400}' = '\x{400}'}).\nok.\n" =
         t({Node,Test1}),
-    test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 otp_14296(Config) when is_list(Config) ->
@@ -3233,9 +3225,6 @@ filename(Name, Config) when is_atom(Name) ->
 filename(Name, Config) ->
     filename:join(proplists:get_value(priv_dir, Config), Name).
 
-start_node(Name, Xargs) ->
-    test_server:start_node(Name, slave, [{args, " " ++ Xargs}]).
-
 purge_and_delete(Module) ->
     (catch code:purge(Module)),
     (catch code:delete(Module)).
diff --git a/lib/stdlib/test/tar_SUITE.erl b/lib/stdlib/test/tar_SUITE.erl
index d055eb88cc..8a236583b9 100644
--- a/lib/stdlib/test/tar_SUITE.erl
+++ b/lib/stdlib/test/tar_SUITE.erl
@@ -914,23 +914,20 @@ do_sparse([Name|Rest], DataDir, PrivDir) ->
 
 %% Test filenames with characters outside the US ASCII range.
 unicode(Config) when is_list(Config) ->
-    run_unicode_node(Config, "+fnu"),
+    run_unicode_node(Config, ["+fnu"]),
     case has_transparent_naming() of
 	true ->
-	    run_unicode_node(Config, "+fnl");
+	    run_unicode_node(Config, ["+fnl"]);
 	false ->
 	    ok
     end.
 
-run_unicode_node(Config, Option) ->
+run_unicode_node(Config, Args) ->
     PrivDir = proplists:get_value(priv_dir, Config),
-    Pa = filename:dirname(code:which(?MODULE)),
-    Args = Option ++ " -pa "++Pa,
-    io:format("~s\n", [Args]),
-    Node = start_node(unicode, Args),
+    {ok, Peer, Node} = ?CT_PEER(Args),
     ok = rpc:call(Node, erlang, apply,
 		  [fun() -> do_unicode(PrivDir) end,[]]),
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 has_transparent_naming() ->
@@ -1014,7 +1011,7 @@ roundtrip_metadata(Config) ->
 
 do_roundtrip_metadata(Dir, File) ->
     Tar = filename:join(Dir, atom_to_list(?FUNCTION_NAME)++".tar"),
-    BeamFile = code:which(compile),
+    BeamFile = code:which(?MODULE),
     {ok,Fd} = erl_tar:open(Tar, [write]),
     ok = erl_tar:add(Fd, BeamFile, File, []),
     ok = erl_tar:close(Fd),
@@ -1131,17 +1128,6 @@ make_temp_dir(Base, I) ->
 	{error,eexist} -> make_temp_dir(Base, I+1)
     end.
 
-start_node(Name, Args) ->
-    [_,Host] = string:tokens(atom_to_list(node()), "@"),
-    ct:log("Trying to start ~w@~s~n", [Name,Host]),
-    case test_server:start_node(Name, peer, [{args,Args}]) of
-	{error,Reason} ->
-	    ct:fail(Reason);
-	{ok,Node} ->
-	    ct:log("Node ~p started~n", [Node]),
-	    Node
-    end.
-
 %% Test that the given tar file is a plain USTAR archive,
 %% without any PAX extensions.
 is_ustar(File) ->
-- 
2.31.1

Places

File 1941-stdlib-peer-ify-application-tests.patch of Package erlang (Revision 0e04b8d79a55adf8ba49c177393a4846)

Places