Skip to content

Commit 9e81351

Browse files
committed
Local shovels: skip tests in mixed-version
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 9e81351

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,15 @@ 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+
case rabbit_ct_helpers:is_mixed_versions() of
101+
true ->
102+
{skip, "This suite does not yet support mixed version testing"};
103+
false ->
104+
rabbit_ct_helpers:run_setup_steps(
105+
Config1,
106+
rabbit_ct_broker_helpers:setup_steps() ++
107+
rabbit_ct_client_helpers:setup_steps())
108+
end.
103109

104110
end_per_suite(Config) ->
105111
application:stop(amqp10_client),

deps/rabbitmq_shovel/test/local_static_SUITE.erl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,16 @@ 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+
case rabbit_ct_helpers:is_mixed_versions() of
65+
true ->
66+
{skip, "This suite does not yet support mixed version testing"};
67+
false ->
68+
rabbit_ct_helpers:run_setup_steps(
69+
Config1,
70+
rabbit_ct_broker_helpers:setup_steps() ++
71+
rabbit_ct_client_helpers:setup_steps() ++
72+
[fun stop_shovel_plugin/1])
73+
end.
6874

6975
end_per_suite(Config) ->
7076
application:stop(amqp10_client),

0 commit comments

Comments
 (0)