From 0fad97f5d5fc9ba0af2e18eaefe7178bdfc91d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Wed, 1 Mar 2023 12:14:46 +0100 Subject: [PATCH] per_user_connection_channel_tracking_SUITE: Remove dead code This code became unused when the `tracking_records_in_ets` feature flag was made required and its compatibility code was removed. Seee #7270. --- .../test/per_user_connection_channel_tracking_SUITE.erl | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl b/deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl index 93ab13638bc2..5d2051b2a8b9 100644 --- a/deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl +++ b/deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl @@ -615,7 +615,6 @@ cluster_node_removed(Config) -> rabbit_ct_broker_helpers:forget_cluster_node(Config, 0, 1), timer:sleep(200), - NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 1, nodename), ?assertEqual(false, is_process_alive(Conn2)), [?assertEqual(false, is_process_alive(Ch)) || Ch <- Chans2], @@ -720,7 +719,6 @@ exists_in_tracked_connection_per_vhost_table(Config, VHost) -> exists_in_tracked_connection_per_vhost_table(Config, 0, VHost). exists_in_tracked_connection_per_vhost_table(Config, NodeIndex, VHost) -> exists_in_tracking_table(Config, NodeIndex, - fun rabbit_connection_tracking:tracked_connection_per_vhost_table_name_for/1, tracked_connection_per_vhost, VHost). @@ -728,7 +726,6 @@ exists_in_tracked_connection_per_user_table(Config, Username) -> exists_in_tracked_connection_per_user_table(Config, 0, Username). exists_in_tracked_connection_per_user_table(Config, NodeIndex, Username) -> exists_in_tracking_table(Config, NodeIndex, - fun rabbit_connection_tracking:tracked_connection_per_user_table_name_for/1, tracked_connection_per_user, Username). @@ -736,14 +733,10 @@ exists_in_tracked_channel_per_user_table(Config, Username) -> exists_in_tracked_channel_per_user_table(Config, 0, Username). exists_in_tracked_channel_per_user_table(Config, NodeIndex, Username) -> exists_in_tracking_table(Config, NodeIndex, - fun rabbit_channel_tracking:tracked_channel_per_user_table_name_for/1, tracked_channel_per_user, Username). -exists_in_tracking_table(Config, NodeIndex, TableNameFun, Table, Key) -> - Node = rabbit_ct_broker_helpers:get_node_config( - Config, NodeIndex, nodename), - Tab = TableNameFun(Node), +exists_in_tracking_table(Config, NodeIndex, Table, Key) -> All = rabbit_ct_broker_helpers:rpc(Config, NodeIndex, ets, lookup, [Table, Key]), lists:keymember(Key, 1, All).