Skip to content

Commit 656c3bd

Browse files
Revert "Revert "Exclude the #3333 test case from mixed version runs""
This reverts commit a4a7c53.
1 parent 2933860 commit 656c3bd

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
@@ -150,25 +150,31 @@ import_case13(Config) ->
150150
import_case14(Config) -> import_file_case(Config, "case14").
151151
%% contains a virtual host with tags
152152
import_case16(Config) ->
153-
case rabbit_ct_broker_helpers:enable_feature_flag(Config, virtual_host_metadata) of
154-
ok ->
155-
import_file_case(Config, "case16"),
156-
VHost = <<"tagged">>,
157-
VHostIsImported =
158-
fun () ->
159-
case vhost_lookup(Config, VHost) of
160-
{error, {no_such_vhosts, _}} -> false;
161-
_ -> true
162-
end
163-
end,
164-
rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
165-
VHostRec = vhost_lookup(Config, VHost),
166-
?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
167-
?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
168-
169-
ok;
170-
Skip ->
171-
Skip
153+
case rabbit_ct_helpers:is_mixed_versions() of
154+
false ->
155+
case rabbit_ct_broker_helpers:enable_feature_flag(Config, virtual_host_metadata) of
156+
ok ->
157+
import_file_case(Config, "case16"),
158+
VHost = <<"tagged">>,
159+
VHostIsImported =
160+
fun () ->
161+
case vhost_lookup(Config, VHost) of
162+
{error, {no_such_vhosts, _}} -> false;
163+
_ -> true
164+
end
165+
end,
166+
rabbit_ct_helpers:await_condition(VHostIsImported, 20000),
167+
VHostRec = vhost_lookup(Config, VHost),
168+
?assertEqual(<<"A case16 description">>, vhost:get_description(VHostRec)),
169+
?assertEqual([multi_dc_replication,ab,cde], vhost:get_tags(VHostRec)),
170+
171+
ok;
172+
Skip ->
173+
Skip
174+
end;
175+
_ ->
176+
%% skip the test in mixed version mode
177+
{skip, "Should not run in mixed version environments"}
172178
end.
173179

174180
export_import_round_trip_case1(Config) ->

0 commit comments

Comments
 (0)