Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,10 @@ init_per_suite(Config0) ->
"dest_queue_down"
]}
]),
Config2 = rabbit_ct_helpers:run_setup_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()),
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config2, nodename),
case rabbit_ct_broker_helpers:enable_feature_flag(
Config2, [Node], 'rabbitmq_4.0.0') of
ok ->
Config2;
_ ->
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
end.
rabbit_ct_helpers:run_setup_steps(
Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()).

end_per_suite(Config) ->
application:stop(amqp10_client),
Expand All @@ -116,7 +109,14 @@ end_per_suite(Config) ->
rabbit_ct_broker_helpers:teardown_steps()).

init_per_group(_, Config) ->
Config.
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
case rabbit_ct_broker_helpers:enable_feature_flag(
Config, [Node], 'rabbitmq_4.0.0') of
ok ->
Config;
_ ->
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
end.

end_per_group(_, Config) ->
Config.
Expand Down
19 changes: 9 additions & 10 deletions deps/rabbitmq_shovel/test/local_dynamic_cluster_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,9 @@ init_per_suite(Config0) ->
"dest_queue_down"
]}
]),
Config2 = rabbit_ct_helpers:run_setup_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()),
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, 'rabbitmq_4.0.0') of
ok ->
Config2;
_ ->
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
end.
rabbit_ct_helpers:run_setup_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()).

end_per_suite(Config) ->
application:stop(amqp10_client),
Expand All @@ -67,7 +61,12 @@ end_per_suite(Config) ->
rabbit_ct_broker_helpers:teardown_steps()).

init_per_group(_, Config) ->
Config.
case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
ok ->
Config;
_ ->
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
end.

end_per_group(_, Config) ->
Config.
Expand Down
26 changes: 12 additions & 14 deletions deps/rabbitmq_shovel/test/local_static_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,10 @@ init_per_suite(Config) ->
"dest_queue_down"
]}
]),
Config2 = rabbit_ct_helpers:run_setup_steps(
Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps() ++
[fun stop_shovel_plugin/1]),
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config2, nodename),
case rabbit_ct_broker_helpers:enable_feature_flag(
Config2, [Node], 'rabbitmq_4.0.0') of
ok ->
Config2;
_ ->
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
end.
rabbit_ct_helpers:run_setup_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps() ++
[fun stop_shovel_plugin/1]).

end_per_suite(Config) ->
application:stop(amqp10_client),
Expand All @@ -82,7 +73,14 @@ end_per_suite(Config) ->
rabbit_ct_broker_helpers:teardown_steps()).

init_per_group(_, Config) ->
Config.
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
case rabbit_ct_broker_helpers:enable_feature_flag(
Config, [Node], 'rabbitmq_4.0.0') of
ok ->
Config;
_ ->
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
end.

end_per_group(_, Config) ->
Config.
Expand Down
Loading