diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl index 3da661aa0002..cb162a050e50 100644 --- a/deps/rabbit/test/quorum_queue_SUITE.erl +++ b/deps/rabbit/test/quorum_queue_SUITE.erl @@ -328,10 +328,14 @@ init_per_testcase(T, Config) init_per_testcase(Testcase, Config) -> ClusterSize = ?config(rmq_nodes_count, Config), IsMixed = rabbit_ct_helpers:is_mixed_versions(), - RabbitMQ3 = case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of - ok -> false; - _ -> true - end, + FF_RMQ_400 = case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.0.0') of + ok -> true; + _ -> false + end, + FF_RMQ_420 = case rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.2.0') of + ok -> true; + _ -> false + end, SameKhepriMacVers = ( rabbit_ct_broker_helpers:do_nodes_run_same_ra_machine_version( Config, khepri_machine)), @@ -369,8 +373,10 @@ init_per_testcase(Testcase, Config) -> {skip, "reclaim_memory_with_wrong_queue_type isn't mixed versions compatible"}; peek_with_wrong_queue_type when IsMixed -> {skip, "peek_with_wrong_queue_type isn't mixed versions compatible"}; - cancel_consumer_gh_3729 when IsMixed andalso RabbitMQ3 -> + cancel_consumer_gh_3729 when not FF_RMQ_400 -> {skip, "this test is not compatible with RabbitMQ 3.13.x"}; + at_most_once_dead_letter_order_maxlen when not FF_RMQ_420 -> + {skip, "ordering bugfix was introduced in 4.2.1"}; _ -> Config1 = rabbit_ct_helpers:testcase_started(Config, Testcase), rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_queues, []),