Skip to content

Commit 42a3dfa

Browse files
Exclude the #3333 test case from mixed version runs
1 parent a809e55 commit 42a3dfa

File tree

1 file changed

+25
-19
lines changed

1 file changed

+25
-19
lines changed

deps/rabbit/test/definition_import_SUITE.erl

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -209,25 +209,31 @@ import_case14(Config) -> import_file_case(Config, "case14").
209209
import_case15(Config) -> import_file_case(Config, "case15").
210210
%% contains a virtual host with tags
211211
import_case16(Config) ->
212-
case rabbit_ct_broker_helpers:enable_feature_flag(Config, virtual_host_metadata) of
213-
ok ->
214-
import_file_case(Config, "case16"),
215-
VHost = <<"tagged">>,
216-
VHostIsImported =
217-
fun () ->
218-
case vhost_lookup(Config, VHost) of
219-
{error, {no_such_vhosts, _}} -> false;
220-
_ -> true
221-
end
222-
end,
223-
rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
224-
VHostRec = vhost_lookup(Config, VHost),
225-
?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
226-
?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
227-
228-
ok;
229-
Skip ->
230-
Skip
212+
case rabbit_ct_helpers:is_mixed_versions() of
213+
false ->
214+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, virtual_host_metadata) of
215+
ok ->
216+
import_file_case(Config, "case16"),
217+
VHost = <<"tagged">>,
218+
VHostIsImported =
219+
fun () ->
220+
case vhost_lookup(Config, VHost) of
221+
{error, {no_such_vhosts, _}} -> false;
222+
_ -> true
223+
end
224+
end,
225+
rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
226+
VHostRec = vhost_lookup(Config, VHost),
227+
?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
228+
?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
229+
230+
ok;
231+
Skip ->
232+
Skip
233+
end;
234+
_ ->
235+
%% skip the test in mixed version mode
236+
{skip, "Should not run in mixed version environments"}
231237
end.
232238

233239
export_import_round_trip_case1(Config) ->

0 commit comments

Comments
 (0)