Skip to content

Commit 3b6b8ef

Browse files
authored
Merge pull request #7476 from rabbitmq/remove-dead-code-in-per_user_connection_channel_tracking_SUITE
per_user_connection_channel_tracking_SUITE: Remove dead code
2 parents dfc2ee6 + 0fad97f commit 3b6b8ef

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,6 @@ cluster_node_removed(Config) ->
615615

616616
rabbit_ct_broker_helpers:forget_cluster_node(Config, 0, 1),
617617
timer:sleep(200),
618-
NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 1, nodename),
619618

620619
?assertEqual(false, is_process_alive(Conn2)),
621620
[?assertEqual(false, is_process_alive(Ch)) || Ch <- Chans2],
@@ -720,30 +719,24 @@ exists_in_tracked_connection_per_vhost_table(Config, VHost) ->
720719
exists_in_tracked_connection_per_vhost_table(Config, 0, VHost).
721720
exists_in_tracked_connection_per_vhost_table(Config, NodeIndex, VHost) ->
722721
exists_in_tracking_table(Config, NodeIndex,
723-
fun rabbit_connection_tracking:tracked_connection_per_vhost_table_name_for/1,
724722
tracked_connection_per_vhost,
725723
VHost).
726724

727725
exists_in_tracked_connection_per_user_table(Config, Username) ->
728726
exists_in_tracked_connection_per_user_table(Config, 0, Username).
729727
exists_in_tracked_connection_per_user_table(Config, NodeIndex, Username) ->
730728
exists_in_tracking_table(Config, NodeIndex,
731-
fun rabbit_connection_tracking:tracked_connection_per_user_table_name_for/1,
732729
tracked_connection_per_user,
733730
Username).
734731

735732
exists_in_tracked_channel_per_user_table(Config, Username) ->
736733
exists_in_tracked_channel_per_user_table(Config, 0, Username).
737734
exists_in_tracked_channel_per_user_table(Config, NodeIndex, Username) ->
738735
exists_in_tracking_table(Config, NodeIndex,
739-
fun rabbit_channel_tracking:tracked_channel_per_user_table_name_for/1,
740736
tracked_channel_per_user,
741737
Username).
742738

743-
exists_in_tracking_table(Config, NodeIndex, TableNameFun, Table, Key) ->
744-
Node = rabbit_ct_broker_helpers:get_node_config(
745-
Config, NodeIndex, nodename),
746-
Tab = TableNameFun(Node),
739+
exists_in_tracking_table(Config, NodeIndex, Table, Key) ->
747740
All = rabbit_ct_broker_helpers:rpc(Config, NodeIndex,
748741
ets, lookup, [Table, Key]),
749742
lists:keymember(Key, 1, All).

0 commit comments

Comments
 (0)