diff options
author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2022-07-29 10:16:58 +0200 |
---|---|---|
committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2022-08-04 09:34:14 +0200 |
commit | c4efdcc851e90d2f8fda81efb9cb022bfc9509cb (patch) | |
tree | be750288a8707f3bf120d5758b2e20955cf87de6 | |
parent | 3b989d0f335471085a594ed286661c4443a69e16 (diff) | |
download | rabbitmq-server-git-c4efdcc851e90d2f8fda81efb9cb022bfc9509cb.tar.gz |
Remove test code which depended on the `user_limits` feature flags
These checks are now irrelevant as the feature flag is required.
(cherry picked from commit 32049cd256717560060d43494f76e31a41e56c22)
7 files changed, 36 insertions, 118 deletions
diff --git a/deps/rabbit/test/definition_import_SUITE.erl b/deps/rabbit/test/definition_import_SUITE.erl index 35e5adff45..df1963e5a4 100644 --- a/deps/rabbit/test/definition_import_SUITE.erl +++ b/deps/rabbit/test/definition_import_SUITE.erl @@ -292,30 +292,19 @@ import_case16(Config) -> import_case17(Config) -> import_invalid_file_case(Config, "failing_case17"). import_case18(Config) -> - case rabbit_ct_helpers:is_mixed_versions() of - false -> - case rabbit_ct_broker_helpers:enable_feature_flag(Config, user_limits) of - ok -> - import_file_case(Config, "case18"), - User = <<"limited_guest">>, - UserIsImported = - fun () -> - case user_lookup(Config, User) of - {error, not_found} -> false; - _ -> true - end - end, - rabbit_ct_helpers:await_condition(UserIsImported, 20000), - {ok, UserRec} = user_lookup(Config, User), - ?assertEqual(#{<<"max-connections">> => 2}, internal_user:get_limits(UserRec)), - ok; - Skip -> - Skip - end; - _ -> - %% skip the test in mixed version mode - {skip, "Should not run in mixed version environments"} - end. + import_file_case(Config, "case18"), + User = <<"limited_guest">>, + UserIsImported = + fun () -> + case user_lookup(Config, User) of + {error, not_found} -> false; + _ -> true + end + end, + rabbit_ct_helpers:await_condition(UserIsImported, 20000), + {ok, UserRec} = user_lookup(Config, User), + ?assertEqual(#{<<"max-connections">> => 2}, internal_user:get_limits(UserRec)), + ok. import_case19(Config) -> case rabbit_ct_helpers:is_mixed_versions() of diff --git a/deps/rabbit/test/per_user_connection_channel_limit_SUITE.erl b/deps/rabbit/test/per_user_connection_channel_limit_SUITE.erl index 589fdd97f4..470d77af48 100644 --- a/deps/rabbit/test/per_user_connection_channel_limit_SUITE.erl +++ b/deps/rabbit/test/per_user_connection_channel_limit_SUITE.erl @@ -75,24 +75,11 @@ init_per_group(cluster_size_1_network, Config) -> Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]), init_per_multinode_group(cluster_size_1_network, Config1, 1); init_per_group(cluster_size_2_network, Config) -> - case rabbit_ct_helpers:is_mixed_versions() of - true -> - %% In a mixed 3.8/3.9 cluster, changes to rabbit_core_ff.erl imply that some - %% feature flag related migrations cannot occur, and therefore user_limits - %% cannot be enabled in a 3.8/3.9 mixed cluster - {skip, "cluster_size_2_network is not mixed version compatible"}; - _ -> - Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]), - init_per_multinode_group(cluster_size_2_network, Config1, 2) - end; + Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]), + init_per_multinode_group(cluster_size_2_network, Config1, 2); init_per_group(cluster_size_2_direct, Config) -> - case rabbit_ct_helpers:is_mixed_versions() of - true -> - {skip, "cluster_size_2_network is not mixed version compatible"}; - _ -> - Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]), - init_per_multinode_group(cluster_size_2_direct, Config1, 2) - end; + Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]), + init_per_multinode_group(cluster_size_2_direct, Config1, 2); init_per_group(cluster_rename, Config) -> init_per_multinode_group(cluster_rename, Config, 2). @@ -108,21 +95,9 @@ init_per_multinode_group(Group, Config, NodeCount) -> % The broker is managed by {init,end}_per_testcase(). Config1; _ -> - Config2 = rabbit_ct_helpers:run_steps( - Config1, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps()), - EnableFF = rabbit_ct_broker_helpers:enable_feature_flag( - Config2, user_limits), - case EnableFF of - ok -> - Config2; - {skip, _} = Skip -> - end_per_group(Group, Config2), - Skip; - Other -> - end_per_group(Group, Config2), - {skip, Other} - end + rabbit_ct_helpers:run_steps( + Config1, rabbit_ct_broker_helpers:setup_steps() ++ + rabbit_ct_client_helpers:setup_steps()) end. end_per_group(cluster_rename, Config) -> diff --git a/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl b/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl index ddfa98e649..455f6a01e1 100644 --- a/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl +++ b/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl @@ -51,16 +51,8 @@ end_per_suite(Config) -> rabbit_ct_helpers:run_teardown_steps(Config). init_per_group(net_ticktime_1 = Group, Config) -> - case rabbit_ct_helpers:is_mixed_versions() of - true -> - %% In a mixed 3.8/3.9 cluster, changes to rabbit_core_ff.erl imply that some - %% feature flag related migrations cannot occur, and therefore user_limits - %% cannot be enabled in a 3.8/3.9 mixed cluster - {skip, "group is not mixed version compatible"}; - _ -> - Config1 = rabbit_ct_helpers:set_config(Config, [{net_ticktime, 1}]), - init_per_multinode_group(Group, Config1, 3) - end. + Config1 = rabbit_ct_helpers:set_config(Config, [{net_ticktime, 1}]), + init_per_multinode_group(Group, Config1, 3). init_per_multinode_group(Group, Config, NodeCount) -> Suffix = rabbit_ct_helpers:testcase_absname(Config, "", "-"), @@ -68,21 +60,9 @@ init_per_multinode_group(Group, Config, NodeCount) -> {rmq_nodes_count, NodeCount}, {rmq_nodename_suffix, Suffix} ]), - Config2 = rabbit_ct_helpers:run_steps( - Config1, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps()), - EnableFF = rabbit_ct_broker_helpers:enable_feature_flag( - Config2, user_limits), - case EnableFF of - ok -> - Config2; - {skip, _} = Skip -> - end_per_group(Group, Config2), - Skip; - Other -> - end_per_group(Group, Config2), - {skip, Other} - end. + rabbit_ct_helpers:run_steps( + Config1, rabbit_ct_broker_helpers:setup_steps() ++ + rabbit_ct_client_helpers:setup_steps()). end_per_group(_Group, Config) -> rabbit_ct_helpers:run_steps(Config, 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 0870465ba2..ba8a367695 100644 --- a/deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl +++ b/deps/rabbit/test/per_user_connection_channel_tracking_SUITE.erl @@ -63,16 +63,8 @@ init_per_group(cluster_size_1_network, Config) -> Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]), init_per_multinode_group(cluster_size_1_network, Config1, 1); init_per_group(cluster_size_2_network, Config) -> - case rabbit_ct_helpers:is_mixed_versions() of - false -> - Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]), - init_per_multinode_group(cluster_size_2_network, Config1, 2); - _ -> - %% In a mixed 3.8/3.9 cluster, changes to rabbit_core_ff.erl imply that some - %% feature flag related migrations cannot occur, and therefore user_limits - %% cannot be enabled in a 3.8/3.9 mixed cluster - {skip, "cluster_size_2_network is not mixed version compatible"} - end; + Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, network}]), + init_per_multinode_group(cluster_size_2_network, Config1, 2); init_per_group(cluster_size_1_direct, Config) -> Config1 = rabbit_ct_helpers:set_config(Config, [{connection_type, direct}]), init_per_multinode_group(cluster_size_1_direct, Config1, 1); @@ -86,21 +78,9 @@ init_per_multinode_group(Group, Config, NodeCount) -> {rmq_nodes_count, NodeCount}, {rmq_nodename_suffix, Suffix} ]), - Config2 = rabbit_ct_helpers:run_steps( - Config1, rabbit_ct_broker_helpers:setup_steps() ++ - rabbit_ct_client_helpers:setup_steps()), - EnableFF = rabbit_ct_broker_helpers:enable_feature_flag( - Config2, user_limits), - case EnableFF of - ok -> - Config2; - {skip, _} = Skip -> - end_per_group(Group, Config2), - Skip; - Other -> - end_per_group(Group, Config2), - {skip, Other} - end. + rabbit_ct_helpers:run_steps( + Config1, rabbit_ct_broker_helpers:setup_steps() ++ + rabbit_ct_client_helpers:setup_steps()). end_per_group(_Group, Config) -> rabbit_ct_helpers:run_steps(Config, diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel index 9b8840b38f..ab8a4cc322 100644 --- a/deps/rabbitmq_management/BUILD.bazel +++ b/deps/rabbitmq_management/BUILD.bazel @@ -149,7 +149,7 @@ suites = [ additional_beam = [ ":rabbit_mgmt_runtime_parameters_util", ], - shard_count = 3, + shard_count = 2, ), rabbitmq_integration_suite( PACKAGE, diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl index 6e0c706021..323128a1b1 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl @@ -38,18 +38,13 @@ all() -> [ {group, all_tests_with_prefix}, - {group, all_tests_without_prefix}, - {group, user_limits_ff} + {group, all_tests_without_prefix} ]. groups() -> [ {all_tests_with_prefix, [], all_tests()}, - {all_tests_without_prefix, [], all_tests()}, - {user_limits_ff, [], [ - user_limits_list_test, - user_limit_set_test - ]} + {all_tests_without_prefix, [], all_tests()} ]. all_tests() -> [ @@ -148,7 +143,9 @@ all_tests() -> [ disable_basic_auth_test, login_test, csp_headers_test, - auth_attempts_test + auth_attempts_test, + user_limits_list_test, + user_limit_set_test ]. %% ------------------------------------------------------------------- @@ -221,8 +218,6 @@ init_per_group(all_tests_with_prefix=Group, Config0) -> end_per_group(Group, Config3), {skip, "Quorum queues are unsupported"} end; -init_per_group(user_limits_ff = Group, Config0) -> - enable_feature_flag_or_skip(user_limits, Group, Config0); init_per_group(Group, Config0) -> enable_feature_flag_or_skip(quorum_queue, Group, Config0). diff --git a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl index 9004c47ef6..5a1e768a95 100644 --- a/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl +++ b/deps/rabbitmq_stream/test/rabbit_stream_SUITE.erl @@ -84,7 +84,6 @@ init_per_group(Group, Config) [classic_mirrored_queue_version, implicit_default_bindings, maintenance_mode_status, - user_limits, virtual_host_metadata, quorum_queue, stream_queue]}]}) |