From 3fd96b509a77623dea0d1b4bca1d4ee83c77805f Mon Sep 17 00:00:00 2001 From: David Ansari Date: Thu, 21 Mar 2024 16:42:57 +0100 Subject: [PATCH] Avoid rabbit_ct_helpers:is_mixed_versions/0 Fixes https://github.com/rabbitmq/rabbitmq-server/pull/10761#discussion_r1528039577 : "Could you please check a real condition that the old version can't be used as part of this test? is_mixed_versions() will still return true in 10 years when testing RabbitMQ 21.x against 22.x. This function should almost never be used." --- deps/rabbitmq_web_mqtt/test/command_SUITE.erl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/deps/rabbitmq_web_mqtt/test/command_SUITE.erl b/deps/rabbitmq_web_mqtt/test/command_SUITE.erl index aa6fcd92625c..16a2c8117fc5 100644 --- a/deps/rabbitmq_web_mqtt/test/command_SUITE.erl +++ b/deps/rabbitmq_web_mqtt/test/command_SUITE.erl @@ -11,7 +11,9 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("rabbitmq_mqtt/include/rabbit_mqtt.hrl"). --import(rabbit_web_mqtt_test_util, [connect/3, connect/4]). + +-import(rabbit_web_mqtt_test_util, + [connect/3, connect/4]). -define(COMMAND, 'Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand'). @@ -53,12 +55,11 @@ end_per_suite(Config) -> init_per_group(unit, Config) -> Config; -init_per_group(Group, Config) -> - case rabbit_ct_helpers:is_mixed_versions() of - true -> - {skip, "mixed version clusters are not supported"}; - _ -> - rabbit_ct_helpers:set_config(Config, {mqtt_version, Group}) +init_per_group(v5 = V5, Config0) -> + Config = rabbit_ct_helpers:set_config(Config0, {mqtt_version, V5}), + case rabbit_ct_broker_helpers:enable_feature_flag(Config, mqtt_v5) of + ok -> Config; + {skip, _} = Skip -> Skip end. end_per_group(_, Config) ->