Skip to content

Commit 7f1febe

Browse files
authored
Local shovels: exclude tests in mixed-versions with 3.13.x (#14482)
The test suites need to be excluded at group level, so the end_per_suite is always executed and the cluster stopped. Otherwise, clusters remain running in CI and the following suites find the TCP ports busy.
1 parent 8cfcd79 commit 7f1febe

File tree

3 files changed

+33
-36
lines changed

3 files changed

+33
-36
lines changed

deps/rabbitmq_shovel/test/local_dynamic_SUITE.erl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,10 @@ init_per_suite(Config0) ->
9797
"dest_queue_down"
9898
]}
9999
]),
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.
100+
rabbit_ct_helpers:run_setup_steps(
101+
Config1,
102+
rabbit_ct_broker_helpers:setup_steps() ++
103+
rabbit_ct_client_helpers:setup_steps()).
111104

112105
end_per_suite(Config) ->
113106
application:stop(amqp10_client),
@@ -116,7 +109,14 @@ end_per_suite(Config) ->
116109
rabbit_ct_broker_helpers:teardown_steps()).
117110

118111
init_per_group(_, Config) ->
119-
Config.
112+
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
113+
case rabbit_ct_broker_helpers:enable_feature_flag(
114+
Config, [Node], 'rabbitmq_4.0.0') of
115+
ok ->
116+
Config;
117+
_ ->
118+
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
119+
end.
120120

121121
end_per_group(_, Config) ->
122122
Config.

deps/rabbitmq_shovel/test/local_dynamic_cluster_SUITE.erl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,9 @@ init_per_suite(Config0) ->
5050
"dest_queue_down"
5151
]}
5252
]),
53-
Config2 = rabbit_ct_helpers:run_setup_steps(Config1,
54-
rabbit_ct_broker_helpers:setup_steps() ++
55-
rabbit_ct_client_helpers:setup_steps()),
56-
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, 'rabbitmq_4.0.0') of
57-
ok ->
58-
Config2;
59-
_ ->
60-
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
61-
end.
53+
rabbit_ct_helpers:run_setup_steps(Config1,
54+
rabbit_ct_broker_helpers:setup_steps() ++
55+
rabbit_ct_client_helpers:setup_steps()).
6256

6357
end_per_suite(Config) ->
6458
application:stop(amqp10_client),
@@ -67,7 +61,12 @@ end_per_suite(Config) ->
6761
rabbit_ct_broker_helpers:teardown_steps()).
6862

6963
init_per_group(_, Config) ->
70-
Config.
64+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of
65+
ok ->
66+
Config;
67+
_ ->
68+
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
69+
end.
7170

7271
end_per_group(_, Config) ->
7372
Config.

deps/rabbitmq_shovel/test/local_static_SUITE.erl

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,10 @@ init_per_suite(Config) ->
6161
"dest_queue_down"
6262
]}
6363
]),
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.
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]).
7768

7869
end_per_suite(Config) ->
7970
application:stop(amqp10_client),
@@ -82,7 +73,14 @@ end_per_suite(Config) ->
8273
rabbit_ct_broker_helpers:teardown_steps()).
8374

8475
init_per_group(_, Config) ->
85-
Config.
76+
[Node] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
77+
case rabbit_ct_broker_helpers:enable_feature_flag(
78+
Config, [Node], 'rabbitmq_4.0.0') of
79+
ok ->
80+
Config;
81+
_ ->
82+
{skip, "This suite requires rabbitmq_4.0.0 feature flag"}
83+
end.
8684

8785
end_per_group(_, Config) ->
8886
Config.

0 commit comments

Comments
 (0)