File 1931-parsetools-peer-ify-parsetools-application... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1931-parsetools-peer-ify-parsetools-application.patch of Package erlang (Revision f55041561f125384b28886aa21e55614)

Currently displaying revision f55041561f125384b28886aa21e55614 , Show latest

From dda5741b60a6a8bfeca37b1c8873110dbbcd17a9 Mon Sep 17 00:00:00 2001
From: Maxim Fedorov <maximfca@gmail.com>
Date: Wed, 17 Nov 2021 10:07:27 -0800
Subject: [PATCH] [parsetools] peer-ify parsetools application

Replace test_server:start_node with `?CT_PEER`, providing
test resilience and even allowing running the same test
concurrently on the same host.
---
 lib/parsetools/test/leex_SUITE.erl | 17 ++---------------
 lib/parsetools/test/yecc_SUITE.erl | 15 ++-------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 3f66c50482..1f8e95a769 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1043,7 +1043,7 @@ otp_11286(doc) ->
     "OTP-11286. A Unicode filename bug; both Leex and Yecc.";
 otp_11286(suite) -> [];
 otp_11286(Config) when is_list(Config) ->
-    Node = start_node(otp_11286, "+fnu"),
+    {ok, Peer, Node} = ?CT_PEER(["+fnu"]),
     Dir = ?privdir,
     UName = [1024] ++ "u",
     UDir = filename:join(Dir, UName),
@@ -1087,7 +1087,7 @@ otp_11286(Config) when is_list(Config) ->
     {ok,_,_} = rpc:call(Node, compile, file,
                   [Scannerfile,[basic_validation,return]]),
 
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 otp_13916(doc) ->
@@ -1127,8 +1127,6 @@ otp_13916(Config) when is_list(Config) ->
     ok.
 
 otp_14285(Config) ->
-    Dir = ?privdir,
-
     Ts = [{otp_14285_1,
            <<"%% encoding: latin-1\n"
              "Definitions.\n"
@@ -1210,17 +1208,6 @@ erlang:display({erlfile,ErlFile}),
     {ok, compiler_warnings, []} = compile:file(ErlFile, [return]),
     ok.
 
-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.
-
 unwritable(Fname) ->
     {ok, Info} = file:read_file_info(Fname),
     Mode = Info#file_info.mode - 8#00200,
diff --git a/lib/parsetools/test/yecc_SUITE.erl b/lib/parsetools/test/yecc_SUITE.erl
index cfdb3e4458..821bbee06c 100644
--- a/lib/parsetools/test/yecc_SUITE.erl
+++ b/lib/parsetools/test/yecc_SUITE.erl
@@ -2021,7 +2021,7 @@ otp_11286(doc) ->
     "OTP-11286. A Unicode filename bug; both Leex and Yecc.";
 otp_11286(suite) -> [];
 otp_11286(Config) when is_list(Config) ->
-    Node = start_node(otp_11286, "+fnu"),
+    {ok, Peer, Node} = ?CT_PEER(["+fnu"]),
     Dir = ?privdir,
     UName = [1024] ++ "u",
     UDir = filename:join(Dir, UName),
@@ -2061,7 +2061,7 @@ otp_11286(Config) when is_list(Config) ->
     Opts = [return, warn_unused_vars,{outdir,Dir}],
     {ok,_,_} = rpc:call(Node, compile, file, [ErlFile, Opts]),
 
-    true = test_server:stop_node(Node),
+    peer:stop(Peer),
     ok.
 
 otp_14285(Config) ->
@@ -2193,17 +2193,6 @@ otp_17535(Config) when is_list(Config) ->
     {ok, _, []} = compile:file(ErlFile, [return]),
     ok.
 
-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.
-
 yeccpre_size() ->
     yeccpre_size(default_yeccpre()).
 
-- 
2.31.1

Places

File 1931-parsetools-peer-ify-parsetools-application.patch of Package erlang (Revision f55041561f125384b28886aa21e55614)

Places