Merge pull request #16045 from rabbitmq/mergify/bp/v4.2.x/pr-16044

Test flake chase: a few more flakes (Apr 13, 2026) (backport #16043) (backport #16044)

Author: michaelklishin

deps/rabbit/test/amqp_proxy_protocol_SUITE.erl

@@ -81,7 +81,6 @@ v1_tls(Config) ->
     [ok = ssl:send(SslSocket, amqp_1_0_frame(FrameType))
      || FrameType <- [header_sasl, sasl_init, header_amqp, open]],
     {ok, _Packet} = ssl:recv(SslSocket, 0, ?TIMEOUT),
-    timer:sleep(1000),
     ConnectionName = rpc(Config, ?MODULE, connection_name, []),
     match = re:run(ConnectionName, <<"^192.168.1.1:80 -> 192.168.1.2:82$">>, [{capture, none}]),
     ok = gen_tcp:close(Socket).

deps/rabbit/test/policy_SUITE.erl

@@ -471,7 +471,7 @@ verify_policies(Policy, OperPolicy, VerifyFuns, #{config := Config,
 verify_policy([], _, _) ->
     ok;
 verify_policy([{HA, Expect} | Tail], Server, QName) ->
-    Expect = check_policy_value(Server, QName, HA),
+    ?awaitMatch(Expect, check_policy_value(Server, QName, HA), 30_000),
     verify_policy(Tail, Server, QName).