Skip to content

Commit 1b1a775

Browse files
committed
Support coverage when node being killed by index
1 parent 57b2968 commit 1b1a775

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ stop_node_after(Config, Node, Sleep) ->
16281628

16291629
kill_node(Config, Node) ->
16301630
Pid = rpc(Config, Node, os, getpid, []),
1631-
cover_remove_node(Node),
1631+
cover_remove_node(Config, Node),
16321632
Cmd = case os:type() of
16331633
{win32, _} ->
16341634
case os:find_executable("taskkill.exe") of
@@ -1920,18 +1920,25 @@ user(Username) ->
19201920
tags = [administrator],
19211921
authz_backends = [{rabbit_auth_backend_internal, none}]}.
19221922

1923-
cover_add_node(Node) ->
1923+
cover_add_node(Node)
1924+
when is_atom(Node) andalso Node =/= undefined ->
19241925
if_cover(
19251926
fun() ->
19261927
{ok, [Node]} = ct_cover:add_nodes([Node])
19271928
end).
19281929

1929-
cover_remove_node(Node) ->
1930+
cover_remove_node(Node)
1931+
when is_atom(Node) andalso Node =/= undefined ->
19301932
if_cover(
19311933
fun() ->
19321934
ok = ct_cover:remove_nodes([Node])
19331935
end).
19341936

1937+
cover_remove_node(Config, Node) ->
1938+
NodeConfig = get_node_config(Config, Node),
1939+
Nodename = ?config(nodename, NodeConfig),
1940+
cover_remove_node(Nodename).
1941+
19351942
if_cover(F) ->
19361943
case os:getenv("COVER") of
19371944
false ->

0 commit comments

Comments
 (0)