Merge pull request #15560 from rabbitmq/mergify/bp/v4.2.x/pr-15558

Test flakes feb25 2026 (backport #15558)

Author: michaelklishin

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -2978,8 +2978,8 @@ simple_confirm_availability_on_leader_change(Config) ->
     assert_cluster_status({Servers, Servers, Running}, Running),
 
     %% this should not fail as the channel should detect the new leader and
-    %% resend to that
-    ok = publish_confirm(Ch, QQ),
+    %% resend to that. Use a generous timeout because on slow CI.
+    ok = publish_confirm(Ch, QQ, 15000),
     ok = rabbit_ct_broker_helpers:start_node(Config, Node2),
     ok.
 

deps/rabbitmq_cli/lib/rabbitmq/cli/core/distribution.ex

@@ -91,6 +91,7 @@ defmodule RabbitMQ.CLI.Core.Distribution do
         {:ok, pid}
 
       {:error, reason} ->
+        :timer.sleep(500)
         start(node_name_type, attempts - 1, reason)
     end
   end
@@ -118,7 +119,7 @@ defmodule RabbitMQ.CLI.Core.Distribution do
         Enum.random(1..1024)
 
       _ ->
-        "#{:os.getpid()}"
+        "#{:os.getpid()}-#{System.unique_integer([:positive])}"
     end
   end
 end

deps/rabbitmq_mqtt/test/retainer_SUITE.erl

@@ -112,7 +112,7 @@ end_per_testcase(Testcase, Config) ->
 %% -------------------------------------------------------------------
 
 coerce_configuration_data(Config) ->
-    C = connect(<<"simpleClientRetainer">>, Config, [{ack_timeout, 1}]),
+    C = connect(atom_to_binary(?FUNCTION_NAME), Config, [{ack_timeout, 1}]),
 
     {ok, _, _} = emqtt:subscribe(C, <<"TopicA">>, qos0),
     ok = emqtt:publish(C, <<"TopicA">>, <<"Payload">>),
@@ -126,7 +126,7 @@ coerce_configuration_data(Config) ->
 %% sent messages for the translated topic (TopicA/Device/Field)
 %% -------------------------------------------------------------------
 should_translate_amqp2mqtt_on_publish(Config) ->
-    C = connect(<<"simpleClientRetainer">>, Config, [{ack_timeout, 1}]),
+    C = connect(atom_to_binary(?FUNCTION_NAME), Config, [{ack_timeout, 1}]),
     %% there's an active consumer
     {ok, _, _} = emqtt:subscribe(C, <<"TopicA/Device.Field">>, qos1),
     ok = emqtt:publish(C, <<"TopicA/Device.Field">>, #{},  <<"Payload">>, [{retain, true}]),
@@ -139,7 +139,7 @@ should_translate_amqp2mqtt_on_publish(Config) ->
 %% sent the retained message for the translated topic (TopicA/Device/Field)
 %% -------------------------------------------------------------------
 should_translate_amqp2mqtt_on_retention(Config) ->
-    C = connect(<<"simpleClientRetainer">>, Config, [{ack_timeout, 1}]),
+    C = connect(atom_to_binary(?FUNCTION_NAME), Config, [{ack_timeout, 1}]),
     %% publish with retain = true before a consumer comes around
     ok = emqtt:publish(C, <<"TopicA/Device.Field">>, #{},  <<"Payload">>, [{retain, true}]),
     {ok, _, _} = emqtt:subscribe(C, <<"TopicA/Device.Field">>, qos1),
@@ -152,14 +152,14 @@ should_translate_amqp2mqtt_on_retention(Config) ->
 %% sent retained message for the translated topic (TopicA/Device/Field)
 %% -------------------------------------------------------------------
 should_translate_amqp2mqtt_on_retention_search(Config) ->
-    C = connect(<<"simpleClientRetainer">>, Config, [{ack_timeout, 1}]),
+    C = connect(atom_to_binary(?FUNCTION_NAME), Config, [{ack_timeout, 1}]),
     ok = emqtt:publish(C, <<"TopicA/Device.Field">>, #{},  <<"Payload">>, [{retain, true}]),
     {ok, _, _} = emqtt:subscribe(C, <<"TopicA/Device/Field">>, qos1),
     ok = expect_publishes(C, <<"TopicA/Device/Field">>, [<<"Payload">>]),
     ok = emqtt:disconnect(C).
 
 does_not_retain(Config) ->
-    C = connect(<<"simpleClientRetainer">>, Config, [{ack_timeout, 1}]),
+    C = connect(atom_to_binary(?FUNCTION_NAME), Config, [{ack_timeout, 1}]),
     ok = emqtt:publish(C, <<"TopicA/Device.Field">>, #{},  <<"Payload">>, [{retain, true}]),
     {ok, _, _} = emqtt:subscribe(C, <<"TopicA/Device.Field">>, qos1),
     receive