Remove test code which depended on the `quorum_queue` feature flags
These checks are now irrelevant as the feature flag is required.
This commit is contained in:
parent
4dd07e2905
commit
6e9ee4d0da
|
@ -58,15 +58,10 @@ init_per_group(classic_queue, Config) ->
|
|||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
|
||||
{queue_durable, true}]);
|
||||
init_per_group(quorum_queue, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(mirrored_queue, Config) ->
|
||||
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,
|
||||
<<"all">>, [{<<"ha-sync-mode">>, <<"automatic">>}]),
|
||||
|
|
|
@ -113,15 +113,10 @@ init_per_group(mirrored_queue, Config) ->
|
|||
{queue_durable, false}]),
|
||||
rabbit_ct_helpers:run_steps(Config1, []);
|
||||
init_per_group(quorum_queue, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(at_most_once, Config) ->
|
||||
case outer_group_name(Config) of
|
||||
quorum_queue ->
|
||||
|
|
|
@ -207,8 +207,6 @@ import_case11(Config) -> import_file_case(Config, "case11").
|
|||
import_case12(Config) -> import_invalid_file_case(Config, "failing_case12").
|
||||
|
||||
import_case13(Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
import_file_case(Config, "case13"),
|
||||
VHost = <<"/">>,
|
||||
QueueName = <<"definitions.import.case13.qq.1">>,
|
||||
|
@ -226,14 +224,9 @@ import_case13(Config) ->
|
|||
?assert(amqqueue:is_quorum(Q)),
|
||||
?assertEqual([{<<"x-max-length">>, long, 991},
|
||||
{<<"x-queue-type">>, longstr, <<"quorum">>}],
|
||||
amqqueue:get_arguments(Q));
|
||||
Skip ->
|
||||
Skip
|
||||
end.
|
||||
amqqueue:get_arguments(Q)).
|
||||
|
||||
import_case13a(Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
import_file_case(Config, "case13"),
|
||||
VHost = <<"/">>,
|
||||
QueueName = <<"definitions.import.case13.qq.1">>,
|
||||
|
@ -251,10 +244,7 @@ import_case13a(Config) ->
|
|||
%% but with different arguments and different properties is a no-op.
|
||||
import_file_case(Config, "case13a"),
|
||||
timer:sleep(1000),
|
||||
?assertMatch({ok, Q}, queue_lookup(Config, VHost, QueueName));
|
||||
Skip ->
|
||||
Skip
|
||||
end.
|
||||
?assertMatch({ok, Q}, queue_lookup(Config, VHost, QueueName)).
|
||||
|
||||
import_case14(Config) -> import_file_case(Config, "case14").
|
||||
%% contains a user with tags as a list
|
||||
|
|
|
@ -73,17 +73,10 @@ init_per_testcase(Testcase, Config) ->
|
|||
{queue_name, Q},
|
||||
{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]}
|
||||
]),
|
||||
Config2 = rabbit_ct_helpers:run_steps(
|
||||
rabbit_ct_helpers:run_steps(
|
||||
Config1,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps()),
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
|
||||
ok ->
|
||||
Config2;
|
||||
Skip ->
|
||||
end_per_testcase(Testcase, Config2),
|
||||
Skip
|
||||
end
|
||||
rabbit_ct_client_helpers:setup_steps())
|
||||
end.
|
||||
|
||||
end_per_testcase(Testcase, Config) ->
|
||||
|
|
|
@ -16,8 +16,7 @@
|
|||
|
||||
all() ->
|
||||
[
|
||||
{group, cluster_size_3},
|
||||
{group, quorum_queues}
|
||||
{group, cluster_size_3}
|
||||
].
|
||||
|
||||
groups() ->
|
||||
|
@ -25,9 +24,7 @@ groups() ->
|
|||
{cluster_size_3, [], [
|
||||
maintenance_mode_status,
|
||||
listener_suspension_status,
|
||||
client_connection_closure
|
||||
]},
|
||||
{quorum_queues, [], [
|
||||
client_connection_closure,
|
||||
quorum_queue_leadership_transfer
|
||||
]}
|
||||
].
|
||||
|
@ -43,17 +40,6 @@ init_per_suite(Config) ->
|
|||
end_per_suite(Config) ->
|
||||
rabbit_ct_helpers:run_teardown_steps(Config).
|
||||
|
||||
init_per_group(quorum_queues, Config) ->
|
||||
case rabbit_ct_helpers:is_mixed_versions() of
|
||||
true ->
|
||||
%% In a mixed 3.8/3.9 cluster, unless the 3.8 node is the
|
||||
%% one in maintenance mode, a quorum won't be available
|
||||
%% due to mixed ra major versions
|
||||
{skip, "test not supported in mixed version mode"};
|
||||
_ ->
|
||||
rabbit_ct_helpers:set_config(Config,
|
||||
[{rmq_nodes_count, 3}])
|
||||
end;
|
||||
init_per_group(_Group, Config) ->
|
||||
rabbit_ct_helpers:set_config(Config,
|
||||
[{rmq_nodes_count, 3}]).
|
||||
|
@ -70,19 +56,10 @@ init_per_testcase(quorum_queue_leadership_transfer = Testcase, Config) ->
|
|||
{rmq_nodename_suffix, Testcase},
|
||||
{tcp_ports_base, {skip_n_nodes, TestNumber * ClusterSize}}
|
||||
]),
|
||||
Config2 = rabbit_ct_helpers:run_steps(
|
||||
rabbit_ct_helpers:run_steps(
|
||||
Config1,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps()),
|
||||
QuorumQueueFFEnabled = rabbit_ct_broker_helpers:enable_feature_flag(
|
||||
Config2, quorum_queue),
|
||||
case QuorumQueueFFEnabled of
|
||||
ok ->
|
||||
Config2;
|
||||
Skip ->
|
||||
end_per_testcase(Testcase, Config2),
|
||||
Skip
|
||||
end;
|
||||
rabbit_ct_client_helpers:setup_steps());
|
||||
init_per_testcase(Testcase, Config) ->
|
||||
rabbit_ct_helpers:testcase_started(Config, Testcase),
|
||||
ClusterSize = ?config(rmq_nodes_count, Config),
|
||||
|
|
|
@ -67,15 +67,10 @@ init_per_group(classic_queue, Config) ->
|
|||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
|
||||
{queue_durable, true}]);
|
||||
init_per_group(quorum_queue, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(mirrored_queue, Config) ->
|
||||
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,
|
||||
<<"all">>, [{<<"ha-sync-mode">>, <<"automatic">>}]),
|
||||
|
|
|
@ -67,15 +67,10 @@ init_per_group(max_length_classic, Config) ->
|
|||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
|
||||
{queue_durable, false}]);
|
||||
init_per_group(max_length_quorum, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(max_length_mirrored, Config) ->
|
||||
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,
|
||||
<<"all">>, [{<<"ha-sync-mode">>, <<"automatic">>}]),
|
||||
|
|
|
@ -90,40 +90,25 @@ init_per_group(classic_queue, Config) ->
|
|||
{consumer_args, []},
|
||||
{queue_durable, true}]);
|
||||
init_per_group(quorum_queue, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
|
||||
{consumer_args, []},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(quorum_queue_in_memory_limit, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>},
|
||||
{<<"x-max-in-memory-length">>, long, 1}]},
|
||||
{consumer_args, []},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(quorum_queue_in_memory_bytes, Config) ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:set_config(
|
||||
Config,
|
||||
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>},
|
||||
{<<"x-max-in-memory-bytes">>, long, 1}]},
|
||||
{consumer_args, []},
|
||||
{queue_durable, true}]);
|
||||
Skip ->
|
||||
Skip
|
||||
end;
|
||||
init_per_group(mirrored_queue, Config) ->
|
||||
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,
|
||||
<<"all">>, [{<<"ha-sync-mode">>, <<"automatic">>}]),
|
||||
|
|
|
@ -54,8 +54,6 @@ init_per_group(Group, Config) ->
|
|||
Config2 = rabbit_ct_helpers:run_steps(Config1b,
|
||||
[fun merge_app_env/1 ] ++
|
||||
rabbit_ct_broker_helpers:setup_steps()),
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
|
||||
ok ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0, application, set_env,
|
||||
[rabbit, channel_tick_interval, 100]),
|
||||
|
@ -73,11 +71,7 @@ init_per_group(Group, Config) ->
|
|||
Config3, 0,
|
||||
<<"ha-policy">>, <<".*">>, <<"queues">>,
|
||||
[{<<"ha-mode">>, <<"all">>}]),
|
||||
Config3;
|
||||
Skip ->
|
||||
end_per_group(Group, Config2),
|
||||
Skip
|
||||
end.
|
||||
Config3.
|
||||
|
||||
merge_app_env(Config) ->
|
||||
rabbit_ct_helpers:merge_app_env(
|
||||
|
|
|
@ -211,10 +211,6 @@ init_per_group(Group, Config) ->
|
|||
{skip, _} ->
|
||||
Ret;
|
||||
Config2 ->
|
||||
EnableFF = rabbit_ct_broker_helpers:enable_feature_flag(
|
||||
Config2, quorum_queue),
|
||||
case EnableFF of
|
||||
ok ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0, application, set_env,
|
||||
[rabbit, channel_tick_interval, 100]),
|
||||
|
@ -222,11 +218,7 @@ init_per_group(Group, Config) ->
|
|||
%% more time after clustering before running the
|
||||
%% tests.
|
||||
timer:sleep(ClusterSize * 1000),
|
||||
Config2;
|
||||
Skip ->
|
||||
end_per_group(Group, Config2),
|
||||
Skip
|
||||
end
|
||||
Config2
|
||||
end
|
||||
end.
|
||||
|
||||
|
@ -252,24 +244,10 @@ init_per_testcase(Testcase, Config) when Testcase == reconnect_consumer_and_publ
|
|||
{queue_name, Q},
|
||||
{alt_queue_name, <<Q/binary, "_alt">>}
|
||||
]),
|
||||
Ret = rabbit_ct_helpers:run_steps(
|
||||
rabbit_ct_helpers:run_steps(
|
||||
Config2,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps()),
|
||||
case Ret of
|
||||
{skip, _} ->
|
||||
Ret;
|
||||
Config3 ->
|
||||
EnableFF = rabbit_ct_broker_helpers:enable_feature_flag(
|
||||
Config3, quorum_queue),
|
||||
case EnableFF of
|
||||
ok ->
|
||||
Config3;
|
||||
Skip ->
|
||||
end_per_testcase(Testcase, Config3),
|
||||
Skip
|
||||
end
|
||||
end;
|
||||
rabbit_ct_client_helpers:setup_steps());
|
||||
init_per_testcase(Testcase, Config) ->
|
||||
ClusterSize = ?config(rmq_nodes_count, Config),
|
||||
IsMixed = rabbit_ct_helpers:is_mixed_versions(),
|
||||
|
@ -309,15 +287,6 @@ init_per_testcase(Testcase, Config) ->
|
|||
{alt_queue_name, <<Q/binary, "_alt">>},
|
||||
{alt_2_queue_name, <<Q/binary, "_alt_2">>}
|
||||
]),
|
||||
EnableFF = rabbit_ct_broker_helpers:enable_feature_flag(
|
||||
Config2, quorum_queue),
|
||||
case EnableFF of
|
||||
ok ->
|
||||
Config2;
|
||||
Skip ->
|
||||
end_per_testcase(Testcase, Config2),
|
||||
Skip
|
||||
end,
|
||||
rabbit_ct_helpers:run_steps(Config2, rabbit_ct_client_helpers:setup_steps())
|
||||
end.
|
||||
|
||||
|
|
|
@ -95,12 +95,9 @@ init_per_group(Group, Config, NodesCount) ->
|
|||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0, application, set_env,
|
||||
[rabbit, channel_tick_interval, 100]),
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
|
||||
ok -> case rabbit_ct_broker_helpers:enable_feature_flag(Config2, stream_queue) of
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, stream_queue) of
|
||||
ok -> Config2;
|
||||
Skip -> Skip
|
||||
end;
|
||||
Skip -> Skip
|
||||
end.
|
||||
|
||||
end_per_group(_, Config) ->
|
||||
|
|
|
@ -43,16 +43,9 @@ init_per_group(tests, Config0) ->
|
|||
Config1 = rabbit_ct_helpers:set_config(
|
||||
Config0, [{rmq_nodes_count, NumNodes},
|
||||
{rmq_nodes_clustered, true}]),
|
||||
Config2 = rabbit_ct_helpers:run_steps(Config1,
|
||||
rabbit_ct_helpers:run_steps(Config1,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps()),
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
|
||||
ok ->
|
||||
Config2;
|
||||
Skip ->
|
||||
end_per_group(tests, Config2),
|
||||
Skip
|
||||
end.
|
||||
rabbit_ct_client_helpers:setup_steps()).
|
||||
|
||||
end_per_group(tests, Config) ->
|
||||
rabbit_ct_helpers:run_steps(Config,
|
||||
|
|
|
@ -64,10 +64,6 @@ init_per_group(classic_queue, Config) ->
|
|||
auto_delete = true}
|
||||
} | Config];
|
||||
init_per_group(quorum_queue, Config) ->
|
||||
Ret = rabbit_ct_broker_helpers:rpc(
|
||||
Config, 0, rabbit_feature_flags, enable, [quorum_queue]),
|
||||
case Ret of
|
||||
ok ->
|
||||
[{single_active_consumer_queue_declare,
|
||||
#'queue.declare'{
|
||||
arguments = [
|
||||
|
@ -75,10 +71,7 @@ init_per_group(quorum_queue, Config) ->
|
|||
{<<"x-queue-type">>, longstr, <<"quorum">>}
|
||||
],
|
||||
durable = true, exclusive = false, auto_delete = false}
|
||||
} | Config];
|
||||
Error ->
|
||||
{skip, {"Quorum queues are unsupported", Error}}
|
||||
end.
|
||||
} | Config].
|
||||
|
||||
end_per_group(_, Config) ->
|
||||
Config.
|
||||
|
|
|
@ -62,10 +62,7 @@ end_per_group(_Group, Config) ->
|
|||
|
||||
init_per_testcase(TestCase, Config) ->
|
||||
rabbit_ct_helpers:testcase_started(Config, TestCase),
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok -> Config;
|
||||
Skip -> Skip
|
||||
end.
|
||||
Config.
|
||||
|
||||
end_per_testcase(TestCase, Config) ->
|
||||
rabbit_ct_helpers:testcase_finished(Config, TestCase).
|
||||
|
|
|
@ -48,26 +48,10 @@ init_per_group(Group, Config) ->
|
|||
{rmq_nodename_suffix, Suffix},
|
||||
{amqp10_client_library, Group}
|
||||
]),
|
||||
Config2 = rabbit_ct_helpers:run_setup_steps(
|
||||
rabbit_ct_helpers:run_setup_steps(
|
||||
Config1,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps()),
|
||||
Nodes = rabbit_ct_broker_helpers:get_node_configs(
|
||||
Config2, nodename),
|
||||
Ret = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0,
|
||||
rabbit_feature_flags,
|
||||
is_supported_remotely,
|
||||
[Nodes, [quorum_queue], 60000]),
|
||||
case Ret of
|
||||
true ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0, rabbit_feature_flags, enable, [quorum_queue]),
|
||||
Config2;
|
||||
false ->
|
||||
end_per_group(Group, Config2),
|
||||
{skip, "Quorum queues are unsupported"}
|
||||
end.
|
||||
rabbit_ct_client_helpers:setup_steps()).
|
||||
|
||||
end_per_group(_, Config) ->
|
||||
rabbit_ct_helpers:run_teardown_steps(Config,
|
||||
|
|
|
@ -138,23 +138,10 @@ init_per_group1(Group, Config) ->
|
|||
{rmq_nodename_suffix, Suffix},
|
||||
{rmq_nodes_clustered, false}
|
||||
]),
|
||||
Config2 = rabbit_ct_helpers:run_steps(Config1,
|
||||
rabbit_ct_helpers:run_steps(Config1,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps() ++
|
||||
SetupFederation ++ Disambiguate),
|
||||
case ?config(target_queue_type, Config2) of
|
||||
quorum ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
|
||||
ok ->
|
||||
Config2;
|
||||
{skip, Skip} ->
|
||||
Skip;
|
||||
Other ->
|
||||
{skip, Other}
|
||||
end;
|
||||
_ ->
|
||||
Config2
|
||||
end.
|
||||
SetupFederation ++ Disambiguate).
|
||||
|
||||
end_per_group(without_disambiguate, Config) ->
|
||||
Config;
|
||||
|
|
|
@ -177,49 +177,14 @@ finish_init(Group, Config) ->
|
|||
Config1 = rabbit_ct_helpers:set_config(Config, NodeConf),
|
||||
merge_app_env(Config1).
|
||||
|
||||
enable_feature_flag_or_skip(FFName, Group, Config0) ->
|
||||
Config1 = finish_init(Group, Config0),
|
||||
Config2 = start_broker(Config1),
|
||||
Nodes = rabbit_ct_broker_helpers:get_node_configs(
|
||||
Config2, nodename),
|
||||
Ret = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0,
|
||||
rabbit_feature_flags,
|
||||
is_supported_remotely,
|
||||
[Nodes, [FFName], 60000]),
|
||||
case Ret of
|
||||
true ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0, rabbit_feature_flags, enable, [FFName]),
|
||||
Config2;
|
||||
false ->
|
||||
end_per_group(Group, Config2),
|
||||
{skip, rabbit_misc:format("Feature flag '~s' is not supported", [FFName])}
|
||||
end.
|
||||
|
||||
init_per_group(all_tests_with_prefix=Group, Config0) ->
|
||||
PathConfig = {rabbitmq_management, [{path_prefix, ?PATH_PREFIX}]},
|
||||
Config1 = rabbit_ct_helpers:merge_app_env(Config0, PathConfig),
|
||||
Config2 = finish_init(Group, Config1),
|
||||
Config3 = start_broker(Config2),
|
||||
Nodes = rabbit_ct_broker_helpers:get_node_configs(
|
||||
Config3, nodename),
|
||||
Ret = rabbit_ct_broker_helpers:rpc(
|
||||
Config3, 0,
|
||||
rabbit_feature_flags,
|
||||
is_supported_remotely,
|
||||
[Nodes, [quorum_queue], 60000]),
|
||||
case Ret of
|
||||
true ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config3, 0, rabbit_feature_flags, enable, [quorum_queue]),
|
||||
Config3;
|
||||
false ->
|
||||
end_per_group(Group, Config3),
|
||||
{skip, "Quorum queues are unsupported"}
|
||||
end;
|
||||
start_broker(Config2);
|
||||
init_per_group(Group, Config0) ->
|
||||
enable_feature_flag_or_skip(quorum_queue, Group, Config0).
|
||||
Config1 = finish_init(Group, Config0),
|
||||
start_broker(Config1).
|
||||
|
||||
end_per_group(_, Config) ->
|
||||
inets:stop(),
|
||||
|
|
|
@ -65,24 +65,10 @@ init_per_group(Group, Config0) ->
|
|||
{rmq_nodes_count, ClusterSize},
|
||||
{tcp_ports_base}],
|
||||
Config2 = rabbit_ct_helpers:set_config(Config1, NodeConf),
|
||||
Ret = rabbit_ct_helpers:run_setup_steps(
|
||||
rabbit_ct_helpers:run_setup_steps(
|
||||
Config2,
|
||||
rabbit_ct_broker_helpers:setup_steps() ++
|
||||
rabbit_ct_client_helpers:setup_steps()),
|
||||
case Ret of
|
||||
{skip, _} ->
|
||||
Ret;
|
||||
Config3 ->
|
||||
EnableFF = rabbit_ct_broker_helpers:enable_feature_flag(
|
||||
Config3, quorum_queue),
|
||||
case EnableFF of
|
||||
ok ->
|
||||
Config3;
|
||||
Skip ->
|
||||
end_per_group(Group, Config3),
|
||||
Skip
|
||||
end
|
||||
end.
|
||||
rabbit_ct_client_helpers:setup_steps()).
|
||||
|
||||
end_per_group(_, Config) ->
|
||||
inets:stop(),
|
||||
|
|
|
@ -122,42 +122,10 @@ init_per_group(all_tests_with_prefix=Group, Config0) ->
|
|||
PathConfig = {rabbitmq_management, [{path_prefix, ?PATH_PREFIX}]},
|
||||
Config1 = rabbit_ct_helpers:merge_app_env(Config0, PathConfig),
|
||||
Config2 = finish_init(Group, Config1),
|
||||
Config3 = start_broker(Config2),
|
||||
Nodes = rabbit_ct_broker_helpers:get_node_configs(
|
||||
Config3, nodename),
|
||||
Ret = rabbit_ct_broker_helpers:rpc(
|
||||
Config3, 0,
|
||||
rabbit_feature_flags,
|
||||
is_supported_remotely,
|
||||
[Nodes, [quorum_queue], 60000]),
|
||||
case Ret of
|
||||
true ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config3, 0, rabbit_feature_flags, enable, [quorum_queue]),
|
||||
Config3;
|
||||
false ->
|
||||
end_per_group(Group, Config3),
|
||||
{skip, "Quorum queues are unsupported"}
|
||||
end;
|
||||
Config3 = start_broker(Config2);
|
||||
init_per_group(Group, Config0) ->
|
||||
Config1 = finish_init(Group, Config0),
|
||||
Config2 = start_broker(Config1),
|
||||
Nodes = rabbit_ct_broker_helpers:get_node_configs(
|
||||
Config2, nodename),
|
||||
Ret = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0,
|
||||
rabbit_feature_flags,
|
||||
is_supported_remotely,
|
||||
[Nodes, [quorum_queue], 60000]),
|
||||
case Ret of
|
||||
true ->
|
||||
ok = rabbit_ct_broker_helpers:rpc(
|
||||
Config2, 0, rabbit_feature_flags, enable, [quorum_queue]),
|
||||
Config2;
|
||||
false ->
|
||||
end_per_group(Group, Config2),
|
||||
{skip, "Quorum queues are unsupported"}
|
||||
end.
|
||||
Config2 = start_broker(Config1).
|
||||
|
||||
end_per_group(_, Config) ->
|
||||
inets:stop(),
|
||||
|
|
|
@ -77,22 +77,6 @@ init_per_group(_, Config) ->
|
|||
end_per_group(_, Config) ->
|
||||
Config.
|
||||
|
||||
init_per_testcase(quorum_queue_stats = Testcase, Config) ->
|
||||
case rabbit_ct_helpers:is_mixed_versions() of
|
||||
true ->
|
||||
{skip, "not mixed versions compatible"};
|
||||
_ ->
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok ->
|
||||
rabbit_ct_helpers:testcase_started(Config, Testcase),
|
||||
rabbit_ct_helpers:run_steps(
|
||||
Config, rabbit_ct_client_helpers:setup_steps());
|
||||
{skip, _} = Skip ->
|
||||
Skip;
|
||||
Other ->
|
||||
{skip, Other}
|
||||
end
|
||||
end;
|
||||
init_per_testcase(Testcase, Config) ->
|
||||
rabbit_ct_helpers:testcase_started(Config, Testcase),
|
||||
rabbit_ct_helpers:run_steps(Config,
|
||||
|
|
|
@ -12,8 +12,7 @@
|
|||
|
||||
all() ->
|
||||
[
|
||||
{group, non_parallel_tests},
|
||||
{group, non_parallel_tests_quorum}
|
||||
{group, non_parallel_tests}
|
||||
].
|
||||
|
||||
groups() ->
|
||||
|
@ -21,9 +20,7 @@ groups() ->
|
|||
{non_parallel_tests, [], [
|
||||
block,
|
||||
handle_invalid_frames,
|
||||
stats
|
||||
]},
|
||||
{non_parallel_tests_quorum, [], [
|
||||
stats,
|
||||
quorum_session_false,
|
||||
quorum_session_true,
|
||||
classic_session_true,
|
||||
|
@ -62,14 +59,6 @@ end_per_suite(Config) ->
|
|||
rabbit_ct_client_helpers:teardown_steps() ++
|
||||
rabbit_ct_broker_helpers:teardown_steps()).
|
||||
|
||||
init_per_group(non_parallel_tests_quorum, Config) ->
|
||||
%% Added for quorum queue test else the mixing test would fail
|
||||
%% with "feature flag is disabled"
|
||||
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
|
||||
ok -> Config;
|
||||
Skip -> Skip
|
||||
end,
|
||||
Config;
|
||||
init_per_group(_, Config) ->
|
||||
Config.
|
||||
|
||||
|
|
|
@ -169,7 +169,6 @@ init_per_group(aggregated_metrics, Config0) ->
|
|||
[{rabbit, [{collect_statistics, coarse}, {collect_statistics_interval, 100}]}]
|
||||
),
|
||||
Config2 = init_per_group(aggregated_metrics, Config1, []),
|
||||
ok = rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue),
|
||||
|
||||
A = rabbit_ct_broker_helpers:get_node_config(Config2, 0, nodename),
|
||||
Ch = rabbit_ct_client_helpers:open_channel(Config2, A),
|
||||
|
|
|
@ -82,7 +82,6 @@ init_per_group(Group, Config)
|
|||
{rabbit,
|
||||
[{forced_feature_flags_on_init,
|
||||
[classic_mirrored_queue_version,
|
||||
quorum_queue,
|
||||
stream_queue]}]})
|
||||
end];
|
||||
_ ->
|
||||
|
|
Loading…
Reference in New Issue