Skip to content

Local shovels: skip tests in mixed-version #14473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2025
+24 −11
Merged

Local shovels: skip tests in mixed-version #14473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,17 @@ init_per_suite(Config0) ->
"dest_queue_down"
]}
]),
rabbit_ct_helpers:run_setup_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps()).
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.

end_per_suite(Config) ->
application:stop(amqp10_client),
Expand All @@ -108,9 +116,6 @@ end_per_suite(Config) ->
rabbit_ct_broker_helpers:teardown_steps()).

init_per_group(_, Config) ->
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
ok = rabbit_ct_broker_helpers:enable_feature_flag(
Config, [Node], 'rabbitmq_4.0.0'),
Config.

end_per_group(_, Config) ->
Expand Down Expand Up @@ -1033,7 +1038,6 @@ local_to_local_stream_credit_flow(Config, AckMode) ->
local_to_local_simple_uri(Config) ->
Src = ?config(srcq, Config),
Dest = ?config(destq, Config),
AltVHost = ?config(alt_vhost, Config),
Uri = <<"amqp://">>,
ok = rabbit_ct_broker_helpers:rpc(
Config, 0, rabbit_runtime_parameters, set,
Expand Down
17 changes: 13 additions & 4 deletions deps/rabbitmq_shovel/test/local_static_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,19 @@ init_per_suite(Config) ->
"dest_queue_down"
]}
]),
rabbit_ct_helpers:run_setup_steps(Config1,
rabbit_ct_broker_helpers:setup_steps() ++
rabbit_ct_client_helpers:setup_steps() ++
[fun stop_shovel_plugin/1]).
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.

end_per_suite(Config) ->
application:stop(amqp10_client),
Expand Down
Loading