Merge pull request #16034 from rabbitmq/mergify/bp/v4.2.x/pr-16033

Test flake chase: AMQP 0-9-1 client, core `quorum_queue_SUITE`: fix a few test flakes (backport #16032) (backport #16033)

Author: michaelklishin

deps/amqp_client/test/system_SUITE.erl

@@ -753,13 +753,15 @@ channel_multi_open_close(Config) ->
                                           ok                 -> ok;
                                           closing            -> ok
                                       catch
-                                          exit:{noproc, _} -> ok;
-                                          exit:{normal, _} -> ok
+                                          exit:{noproc, _}       -> ok;
+                                          exit:{normal, _}       -> ok;
+                                          exit:{{shutdown, _}, _} -> ok
                                       end;
                 closing            -> ok
             catch
-                exit:{noproc, _} -> ok;
-                exit:{normal, _} -> ok
+                exit:{noproc, _}       -> ok;
+                exit:{normal, _}       -> ok;
+                exit:{{shutdown, _}, _} -> ok
             end
         end) || _ <- lists:seq(1, 50)],
     erlang:yield(),
@@ -1200,7 +1202,7 @@ default_consumer(Config) ->
     receive
         {#'basic.deliver'{}, #'amqp_msg'{payload = Payload}} ->
             ok
-    after 1000 ->
+    after 30000 ->
             exit('default_consumer_didnt_work')
     end,
     teardown(Connection, Channel).

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -4042,7 +4042,6 @@ queue_length_limit_policy_cleared(Config) ->
            Config, 0, <<"max-length">>, QQ, <<"queues">>,
            [{<<"max-length">>, 2},
             {<<"overflow">>, <<"reject-publish">>}]),
-    timer:sleep(1000),
     RaName = ra_name(QQ),
     QueryFun = fun rabbit_fifo:overview/1,
     ?awaitMatch({ok, {_, #{config := #{max_length := 2}}}, _},