Skip to content

Commit 0977ad2

Browse files
authored
Local shovels: skip tests in mixed-version (#14473)
Local shovels require rabbitmq_4_0_0 feature flag, so it can't run in mixed-version clusters with 3.13.x
1 parent 07ad94b commit 0977ad2

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,17 @@ init_per_suite(Config0) ->
9797
"dest_queue_down"
9898
]}
9999
]),
100-
rabbit_ct_helpers:run_setup_steps(Config1,
101-
rabbit_ct_broker_helpers:setup_steps() ++
102-
rabbit_ct_client_helpers:setup_steps()).
100+
Config2 = rabbit_ct_helpers:run_setup_steps(Config1,
101+
rabbit_ct_broker_helpers:setup_steps() ++
102+
rabbit_ct_client_helpers:setup_steps()),
103+
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config2, nodename),
104+
case rabbit_ct_broker_helpers:enable_feature_flag(
105+
Config2, [Node], 'rabbitmq_4.0.0') of
106+
ok ->
107+
Config2;
108+
_ ->
109+
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
110+
end.
103111

104112
end_per_suite(Config) ->
105113
application:stop(amqp10_client),
@@ -108,9 +116,6 @@ end_per_suite(Config) ->
108116
rabbit_ct_broker_helpers:teardown_steps()).
109117

110118
init_per_group(_, Config) ->
111-
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
112-
ok = rabbit_ct_broker_helpers:enable_feature_flag(
113-
Config, [Node], 'rabbitmq_4.0.0'),
114119
Config.
115120

116121
end_per_group(_, Config) ->
@@ -1033,7 +1038,6 @@ local_to_local_stream_credit_flow(Config, AckMode) ->
10331038
local_to_local_simple_uri(Config) ->
10341039
Src = ?config(srcq, Config),
10351040
Dest = ?config(destq, Config),
1036-
AltVHost = ?config(alt_vhost, Config),
10371041
Uri = <<"amqp://">>,
10381042
ok = rabbit_ct_broker_helpers:rpc(
10391043
Config, 0, rabbit_runtime_parameters, set,

deps/rabbitmq_shovel/test/local_static_SUITE.erl

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,19 @@ init_per_suite(Config) ->
6161
"dest_queue_down"
6262
]}
6363
]),
64-
rabbit_ct_helpers:run_setup_steps(Config1,
65-
rabbit_ct_broker_helpers:setup_steps() ++
66-
rabbit_ct_client_helpers:setup_steps() ++
67-
[fun stop_shovel_plugin/1]).
64+
Config2 = rabbit_ct_helpers:run_setup_steps(
65+
Config1,
66+
rabbit_ct_broker_helpers:setup_steps() ++
67+
rabbit_ct_client_helpers:setup_steps() ++
68+
[fun stop_shovel_plugin/1]),
69+
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config2, nodename),
70+
case rabbit_ct_broker_helpers:enable_feature_flag(
71+
Config2, [Node], 'rabbitmq_4.0.0') of
72+
ok ->
73+
Config2;
74+
_ ->
75+
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
76+
end.
6877

6978
end_per_suite(Config) ->
7079
application:stop(amqp10_client),

0 commit comments

Comments
 (0)