Rename disconnect_node_by_name to disconnect_node_by_id

esl · May 16, 2024 · 06d99a8 · 06d99a8
1 parent 0209ac8
commit 06d99a8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/test/cets_disco_SUITE.erl b/test/cets_disco_SUITE.erl
@@ -43,7 +43,7 @@
     block_node/2,
     reconnect_node/2,
     disconnect_node/2,
-    disconnect_node_by_name/2
+    disconnect_node_by_id/2
 ]).
 
 -import(cets_test_rpc, [
@@ -636,7 +636,7 @@ disco_nodeup_timestamp_is_updated_after_node_reconnects(Config) ->
     Setup = setup_two_nodes_and_discovery(Config, [wait, disco2]),
     #{disco := Disco, node2 := Node2} = Setup,
     OldTimestamp = cets_test_helper:get_disco_timestamp(Disco, nodeup_timestamps, Node2),
-    disconnect_node_by_name(Config, ct2),
+    disconnect_node_by_id(Config, ct2),
     wait_for_disco_timestamp_to_be_updated(Disco, nodeup_timestamps, Node2, OldTimestamp).
 
 disco_node_start_timestamp_is_updated_after_node_restarts(Config) ->

diff --git a/test/cets_test_peer.erl b/test/cets_test_peer.erl
@@ -9,18 +9,18 @@
     block_node/2,
     reconnect_node/2,
     disconnect_node/2,
-    disconnect_node_by_name/2
+    disconnect_node_by_id/2
 ]).
 
 -import(cets_test_rpc, [rpc/4]).
 
 -include_lib("common_test/include/ct.hrl").
 
-start(Names, Config) ->
-    {Nodes, Peers} = lists:unzip([find_or_start_node(N) || N <- Names]),
+start(Ids, Config) ->
+    {Nodes, Peers} = lists:unzip([find_or_start_node(Id) || Id <- Ids]),
     [
-        {nodes, maps:from_list(lists:zip(Names, Nodes))},
-        {peers, maps:from_list(lists:zip(Names, Peers))}
+        {nodes, maps:from_list(lists:zip(Ids, Nodes))},
+        {peers, maps:from_list(lists:zip(Ids, Peers))}
         | Config
     ].
 
@@ -101,7 +101,7 @@ reconnect_node(Node, Peer) when is_atom(Node), is_pid(Peer) ->
 disconnect_node(RPCNode, DisconnectNode) ->
     rpc(RPCNode, erlang, disconnect_node, [DisconnectNode]).
 
-disconnect_node_by_name(Config, Id) ->
+disconnect_node_by_id(Config, Id) ->
     Peer = maps:get(Id, proplists:get_value(peers, Config)),
     Node = maps:get(Id, proplists:get_value(nodes, Config)),
     %% We could need to retry to disconnect, if the local node is currently trying to establish a connection

diff --git a/test/cets_test_setup.erl b/test/cets_test_setup.erl
@@ -48,7 +48,7 @@
 
 -import(cets_test_peer, [
     disconnect_node/2,
-    disconnect_node_by_name/2
+    disconnect_node_by_id/2
 ]).
 
 -import(cets_test_rpc, [rpc/4]).
@@ -214,7 +214,7 @@ setup_two_nodes_and_discovery(Config, Flags) ->
     Node1 = node(),
     #{ct2 := Peer2} = proplists:get_value(peers, Config),
     #{ct2 := Node2} = proplists:get_value(nodes, Config),
-    disconnect_node_by_name(Config, ct2),
+    disconnect_node_by_id(Config, ct2),
     Tab = make_name(Config),
     {ok, _Pid1} = start(Node1, Tab),
     {ok, _Pid2} = start(Peer2, Tab),
@@ -252,7 +252,7 @@ setup_two_nodes_and_discovery(Config, Flags) ->
     case lists:member(netsplit, Flags) of
         true ->
             %% Simulate a loss of connection between nodes
-            disconnect_node_by_name(Config, ct2);
+            disconnect_node_by_id(Config, ct2);
         false ->
             ok
     end,