Skip to content

Commit 375f743

Browse files
dumbbelldumbbell
committed
Use the new feature flags helper in rabbit_ct_broker_helpers
It simplifies the test of feature flags support. While here, update the `queue_parallel` testsuite to use it.
1 parent 8ee9666 commit 375f743

6 files changed

+33
-82
lines changed

‎test/dead_lettering_SUITE.erl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,14 @@ init_per_group(classic_queue, Config) ->
9393
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
9494
{queue_durable, false}]);
9595
init_per_group(quorum_queue, Config) ->
96-
Nodes = rabbit_ct_broker_helpers:get_node_configs(
97-
Config, nodename),
98-
Ret = rabbit_ct_broker_helpers:rpc(
99-
Config, 0,
100-
rabbit_feature_flags,
101-
is_supported_remotely,
102-
[Nodes, [quorum_queue], 60000]),
103-
case Ret of
104-
true ->
105-
ok = rabbit_ct_broker_helpers:rpc(
106-
Config, 0, rabbit_feature_flags, enable, [quorum_queue]),
96+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
97+
ok ->
10798
rabbit_ct_helpers:set_config(
10899
Config,
109100
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
110101
{queue_durable, true}]);
111-
false ->
112-
{skip, "Quorum queues are unsupported"}
102+
Skip ->
103+
Skip
113104
end;
114105
init_per_group(mirrored_queue, Config) ->
115106
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,

‎test/dynamic_qq_SUITE.erl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,12 @@ init_per_testcase(Testcase, Config) ->
8787
Config1,
8888
rabbit_ct_broker_helpers:setup_steps() ++
8989
rabbit_ct_client_helpers:setup_steps()),
90-
Nodes = rabbit_ct_broker_helpers:get_node_configs(
91-
Config2, nodename),
92-
Ret = rabbit_ct_broker_helpers:rpc(
93-
Config2, 0,
94-
rabbit_feature_flags,
95-
is_supported_remotely,
96-
[Nodes, [quorum_queue], 60000]),
97-
case Ret of
98-
true ->
99-
ok = rabbit_ct_broker_helpers:rpc(
100-
Config2, 0, rabbit_feature_flags, enable, [quorum_queue]),
90+
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
91+
ok ->
10192
Config2;
102-
false ->
93+
Skip ->
10394
end_per_testcase(Testcase, Config2),
104-
{skip, "Quorum queues are unsupported"}
95+
Skip
10596
end.
10697

10798
end_per_testcase(Testcase, Config) ->

‎test/publisher_confirms_parallel_SUITE.erl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,14 @@ init_per_group(classic_queue, Config) ->
7474
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
7575
{queue_durable, true}]);
7676
init_per_group(quorum_queue, Config) ->
77-
Nodes = rabbit_ct_broker_helpers:get_node_configs(
78-
Config, nodename),
79-
Ret = rabbit_ct_broker_helpers:rpc(
80-
Config, 0,
81-
rabbit_feature_flags,
82-
is_supported_remotely,
83-
[Nodes, [quorum_queue], 60000]),
84-
case Ret of
85-
true ->
86-
ok = rabbit_ct_broker_helpers:rpc(
87-
Config, 0, rabbit_feature_flags, enable, [quorum_queue]),
77+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
78+
ok ->
8879
rabbit_ct_helpers:set_config(
8980
Config,
9081
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
9182
{queue_durable, true}]);
92-
false ->
93-
{skip, "Quorum queues are unsupported"}
83+
Skip ->
84+
Skip
9485
end;
9586
init_per_group(mirrored_queue, Config) ->
9687
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,

‎test/queue_parallel_SUITE.erl

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,15 @@ init_per_group(classic_queue, Config) ->
8888
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
8989
{queue_durable, true}]);
9090
init_per_group(quorum_queue, Config) ->
91-
rabbit_ct_helpers:set_config(
92-
Config,
93-
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
94-
{queue_durable, true}]);
91+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
92+
ok ->
93+
rabbit_ct_helpers:set_config(
94+
Config,
95+
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
96+
{queue_durable, true}]);
97+
Skip ->
98+
Skip
99+
end;
95100
init_per_group(mirrored_queue, Config) ->
96101
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,
97102
<<"all">>, [{<<"ha-sync-mode">>, <<"automatic">>}]),

‎test/quorum_queue_SUITE.erl

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,8 @@ init_per_group(Group, Config) ->
151151
Config2 = rabbit_ct_helpers:run_steps(Config1b,
152152
[fun merge_app_env/1 ] ++
153153
rabbit_ct_broker_helpers:setup_steps()),
154-
Nodes = rabbit_ct_broker_helpers:get_node_configs(
155-
Config2, nodename),
156-
Ret = rabbit_ct_broker_helpers:rpc(
157-
Config2, 0,
158-
rabbit_feature_flags,
159-
is_supported_remotely,
160-
[Nodes, [quorum_queue], 60000]),
161-
case Ret of
162-
true ->
163-
ok = rabbit_ct_broker_helpers:rpc(
164-
Config2, 0, rabbit_feature_flags, enable, [quorum_queue]),
154+
case rabbit_ct_broker_helpers:enable_feature_flag(Config2, quorum_queue) of
155+
ok ->
165156
ok = rabbit_ct_broker_helpers:rpc(
166157
Config2, 0, application, set_env,
167158
[rabbit, channel_queue_cleanup_interval, 100]),
@@ -174,9 +165,9 @@ init_per_group(Group, Config) ->
174165
_ ->
175166
Config2
176167
end;
177-
false ->
168+
Skip ->
178169
end_per_group(Group, Config2),
179-
{skip, "Quorum queues are unsupported"}
170+
Skip
180171
end.
181172

182173
end_per_group(clustered, Config) ->
@@ -206,21 +197,12 @@ init_per_testcase(Testcase, Config) when Testcase == reconnect_consumer_and_publ
206197
rabbit_ct_client_helpers:setup_steps() ++
207198
[fun rabbit_ct_broker_helpers:enable_dist_proxy/1,
208199
fun rabbit_ct_broker_helpers:cluster_nodes/1]),
209-
Nodes = rabbit_ct_broker_helpers:get_node_configs(
210-
Config3, nodename),
211-
Ret = rabbit_ct_broker_helpers:rpc(
212-
Config3, 0,
213-
rabbit_feature_flags,
214-
is_supported_remotely,
215-
[Nodes, [quorum_queue], 60000]),
216-
case Ret of
217-
true ->
218-
ok = rabbit_ct_broker_helpers:rpc(
219-
Config3, 0, rabbit_feature_flags, enable, [quorum_queue]),
200+
case rabbit_ct_broker_helpers:enable_feature_flag(Config3, quorum_queue) of
201+
ok ->
220202
Config3;
221-
false ->
203+
Skip ->
222204
end_per_testcase(Testcase, Config3),
223-
{skip, "Quorum queues are unsupported"}
205+
Skip
224206
end;
225207
init_per_testcase(Testcase, Config) ->
226208
Config1 = rabbit_ct_helpers:testcase_started(Config, Testcase),

‎test/unit_inbroker_parallel_SUITE.erl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,14 @@ init_per_group(max_length_classic, Config) ->
9898
[{queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
9999
{queue_durable, false}]);
100100
init_per_group(max_length_quorum, Config) ->
101-
Nodes = rabbit_ct_broker_helpers:get_node_configs(
102-
Config, nodename),
103-
Ret = rabbit_ct_broker_helpers:rpc(
104-
Config, 0,
105-
rabbit_feature_flags,
106-
is_supported_remotely,
107-
[Nodes, [quorum_queue], 60000]),
108-
case Ret of
109-
true ->
110-
ok = rabbit_ct_broker_helpers:rpc(
111-
Config, 0, rabbit_feature_flags, enable, [quorum_queue]),
101+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, quorum_queue) of
102+
ok ->
112103
rabbit_ct_helpers:set_config(
113104
Config,
114105
[{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
115106
{queue_durable, true}]);
116-
false ->
117-
{skip, "Quorum queues are unsupported"}
107+
Skip ->
108+
Skip
118109
end;
119110
init_per_group(max_length_mirrored, Config) ->
120111
rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,

0 commit comments

Comments
 (0)