From e3bd058933cbe13c2d7cf5614e1101f168b0665d Mon Sep 17 00:00:00 2001
From: David Ansari <david.ansari@gmx.de>
Date: Thu, 27 Mar 2025 09:51:56 +0100
Subject: [PATCH] Bump timeout in RabbitMQ AMQP 1.0 Erlang client

Bump the timeout for management operations and link attachments from 20s
to 30s. We've seen timeouts in CI.

We bump the poll interval of the `?awaitMatch` macro because CI
sometimes flaked by crashing in
https://github.com/rabbitmq/rabbitmq-server/blob/0e803de6dd54bea8dd86290c76625c11302d2ea2/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl#L411
which indicates that the client lib received a response from a previous
request.

(cherry picked from commit 44657cd3939ae5f0c4ab1769f583f6d659e57df9)
---
 deps/rabbit/test/amqp_client_SUITE.erl                 | 4 ++--
 deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/rabbit/test/amqp_client_SUITE.erl b/deps/rabbit/test/amqp_client_SUITE.erl
index 35f7c9d5c198..fbabfc9e1e9a 100644
--- a/deps/rabbit/test/amqp_client_SUITE.erl
+++ b/deps/rabbit/test/amqp_client_SUITE.erl
@@ -3873,7 +3873,7 @@ leader_transfer_credit(QName, QType, Credit, Config) ->
          QName,
          #{arguments => #{<<"x-queue-type">> => {utf8, QType},
                           <<"x-queue-leader-locator">> => {utf8, <<"client-local">>}}}),
-       60000),
+       60_000, 5000),
     ok = close(Init),
 
     OpnConf = connection_config(0, Config),
@@ -5456,7 +5456,7 @@ dead_letter_into_stream(Config) ->
          #{arguments => #{<<"x-queue-type">> => {utf8, <<"stream">>},
                           <<"x-initial-cluster-size">> => {ulong, 1}
                          }}),
-       60000),
+       60_000, 5000),
     {ok, Receiver} = amqp10_client:attach_receiver_link(
                        Session1, <<"receiver">>, <<"/amq/queue/", QName1/binary>>,
                        settled, configuration,
diff --git a/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl b/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl
index 2ef253931aa6..e4c02767b988 100644
--- a/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl
+++ b/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl
@@ -33,7 +33,7 @@
         set_token/2
        ].
 
--define(TIMEOUT, 20_000).
+-define(TIMEOUT, 30_000).
 -define(MANAGEMENT_NODE_ADDRESS, <<"/management">>).
 
 -type arguments() :: #{binary() => {atom(), term()}}.