Fix more 4.2.x/3.13.7 mixed mode incompatibilities

(cherry picked from commit b557f80)

Author: michaelklishin

deps/rabbit/test/cli_forget_cluster_node_SUITE.erl

@@ -77,7 +77,7 @@ init_per_testcase(Testcase, Config) ->
             %% In a 4.2+ and 3.13.x mixed cluster, osiris 1.8.x (in 3.13.x) is
             %% incompatible with 1.10.x in terms of badrpc message handling.
             %% Skip all stream-related tests in mixed version mode.
-            {skip, "stream tests are not mixed version compatible"};
+            {skip, "forget_cluster_node streams-related tests are not mixed version compatible"};
         _ ->
             rabbit_ct_helpers:testcase_started(Config, Testcase),
             ClusterSize = ?config(rmq_nodes_count, Config),

deps/rabbit/test/logging_SUITE.erl

@@ -154,44 +154,15 @@ init_per_testcase(Testcase, Config) ->
         %% The exchange output requires RabbitMQ to run. All testcases in this
         %% group will run in the context of that RabbitMQ node.
         exchange_output ->
-            Config1 = rabbit_ct_helpers:set_config(
-                        Config,
-                        [{rmq_nodename_suffix, Testcase}]),
-            Config2 = (
-              case Testcase of
-                  use_exchange_logger_when_enabling_khepri_db ->
-                      rabbit_ct_helpers:set_config(
-                        Config1,
-                        [{rmq_nodes_count, 3},
-                         {metadata_store, mnesia}]);
-                  use_exchange_logger_when_enabling_all_feature_flags ->
-                      rabbit_ct_helpers:set_config(
-                        Config1,
-                        [{rmq_nodes_count, 3}]);
-                  _ ->
-                      rabbit_ct_helpers:set_config(
-                        Config1,
-                        [{rmq_nodes_count, 1}])
-              end),
-            LogCfg = {log, [
-                            {exchange, [{enabled, true}, {level, debug}]},
-                            {file, [{level, debug}]}
-                           ]},
-            Config3 = (
-              case Testcase of
-                  use_exchange_logger_when_enabling_all_feature_flags ->
-                      rabbit_ct_helpers:merge_app_env(
-                        Config2, {rabbit, [LogCfg,
-                                           {forced_feature_flags_on_init, []}
-                                          ]});
-                  _ ->
-                      rabbit_ct_helpers:merge_app_env(
-                        Config2, {rabbit, [LogCfg]})
-              end),
-            rabbit_ct_helpers:run_steps(
-              Config3,
-              rabbit_ct_broker_helpers:setup_steps() ++
-              rabbit_ct_client_helpers:setup_steps());
+            case Testcase =:= use_exchange_logger_when_enabling_all_feature_flags
+                 andalso rabbit_ct_helpers:is_mixed_versions() of
+                true ->
+                    {skip,
+                     "use_exchange_logger_when_enabling_all_feature_flags has a 4.2.x/3.13.7 "
+                     "mixed mode incompatibility due to the lists of stable feature flags."};
+                false ->
+                    init_per_testcase_exchange_output(Testcase, Config)
+            end;
 
         %% Other groups and testcases run the tested code directly without a
         %% RabbitMQ node running.
@@ -205,6 +176,46 @@ init_per_testcase(Testcase, Config) ->
               Config, {log_base_dir, LogBaseDir})
     end.
 
+init_per_testcase_exchange_output(Testcase, Config) ->
+    Config1 = rabbit_ct_helpers:set_config(
+                Config,
+                [{rmq_nodename_suffix, Testcase}]),
+    Config2 = (
+      case Testcase of
+          use_exchange_logger_when_enabling_khepri_db ->
+              rabbit_ct_helpers:set_config(
+                Config1,
+                [{rmq_nodes_count, 3},
+                 {metadata_store, mnesia}]);
+          use_exchange_logger_when_enabling_all_feature_flags ->
+              rabbit_ct_helpers:set_config(
+                Config1,
+                [{rmq_nodes_count, 3}]);
+          _ ->
+              rabbit_ct_helpers:set_config(
+                Config1,
+                [{rmq_nodes_count, 1}])
+      end),
+    LogCfg = {log, [
+                    {exchange, [{enabled, true}, {level, debug}]},
+                    {file, [{level, debug}]}
+                   ]},
+    Config3 = (
+      case Testcase of
+          use_exchange_logger_when_enabling_all_feature_flags ->
+              rabbit_ct_helpers:merge_app_env(
+                Config2, {rabbit, [LogCfg,
+                                   {forced_feature_flags_on_init, []}
+                                  ]});
+          _ ->
+              rabbit_ct_helpers:merge_app_env(
+                Config2, {rabbit, [LogCfg]})
+      end),
+    rabbit_ct_helpers:run_steps(
+      Config3,
+      rabbit_ct_broker_helpers:setup_steps() ++
+      rabbit_ct_client_helpers:setup_steps()).
+
 end_per_testcase(Testcase, Config) ->
     Config1 = case rabbit_ct_helpers:get_config(Config, rmq_nodes_count) of
                   undefined ->

deps/rabbit/test/rabbit_stream_sac_coordinator_SUITE.erl

@@ -28,6 +28,9 @@
 -define(STATE, rabbit_stream_sac_coordinator).
 -define(MOD, rabbit_stream_sac_coordinator).
 
+suite() ->
+    [{timetrap, {seconds, 240}}].
+
 all() ->
     [{group, tests}].