From dc599e3eb331bc65fadc87300526f8872826df84 Mon Sep 17 00:00:00 2001
From: David Ansari <david.ansari@gmx.de>
Date: Mon, 30 Dec 2024 16:56:18 +0000
Subject: [PATCH 1/2] Speed up tests

Multiple test cases were recently slowed down by up to 30 seconds.
This commit reverts these changes.

(cherry picked from commit 42ede4a2582dcc969a824ca5107cb16355d9b0f1)

# Conflicts:
#	deps/rabbit/test/amqp_client_SUITE.erl
---
 deps/rabbit/test/amqp_client_SUITE.erl | 8 ++++++--
 deps/rabbitmq_mqtt/test/util.erl       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/deps/rabbit/test/amqp_client_SUITE.erl b/deps/rabbit/test/amqp_client_SUITE.erl
index dd57ff3a38bf..2f4b8bc2ee22 100644
--- a/deps/rabbit/test/amqp_client_SUITE.erl
+++ b/deps/rabbit/test/amqp_client_SUITE.erl
@@ -6000,7 +6000,7 @@ receive_all_messages0(Receiver, Accept, Acc) ->
                     false -> ok
                 end,
                 receive_all_messages0(Receiver, Accept, [Msg | Acc])
-    after 5000 ->
+    after 2000 ->
               lists:reverse(Acc)
     end.
 
@@ -6152,7 +6152,7 @@ count_received_messages0(Receiver, Count) ->
     receive
         {amqp10_msg, Receiver, _Msg} ->
             count_received_messages0(Receiver, Count + 1)
-    after 5000 ->
+    after 2000 ->
               Count
     end.
 
@@ -6216,7 +6216,11 @@ assert_link_credit_runs_out(Sender, Left) ->
             receive {amqp10_event, {link, Sender, credited}} ->
                         ct:pal("credited with ~b messages left", [Left]),
                         assert_link_credit_runs_out(Sender, Left - 1)
+<<<<<<< HEAD
             after 500 ->
+=======
+            after 1000 ->
+>>>>>>> 42ede4a25 (Speed up tests)
                       ct:pal("insufficient link credit with ~b messages left", [Left]),
                       ok
             end
diff --git a/deps/rabbitmq_mqtt/test/util.erl b/deps/rabbitmq_mqtt/test/util.erl
index 4ab564714d7f..90dfc16039fb 100644
--- a/deps/rabbitmq_mqtt/test/util.erl
+++ b/deps/rabbitmq_mqtt/test/util.erl
@@ -65,7 +65,7 @@ expect_publishes(Client, Topic, [Payload|Rest])
                     payload := Other}} ->
             ct:fail("Received unexpected PUBLISH payload. Expected: ~p Got: ~p",
                     [Payload, Other])
-    after 30_000 ->
+    after 5000 ->
               {publish_not_received, Payload}
     end.
 

From 0be07978baf739b1b6807401bdb4aaa5ccd8739f Mon Sep 17 00:00:00 2001
From: David Ansari <david.ansari@gmx.de>
Date: Tue, 31 Dec 2024 10:04:00 +0100
Subject: [PATCH 2/2] Resolve conflict

---
 deps/rabbit/test/amqp_client_SUITE.erl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deps/rabbit/test/amqp_client_SUITE.erl b/deps/rabbit/test/amqp_client_SUITE.erl
index 2f4b8bc2ee22..f25bc9968999 100644
--- a/deps/rabbit/test/amqp_client_SUITE.erl
+++ b/deps/rabbit/test/amqp_client_SUITE.erl
@@ -6216,11 +6216,7 @@ assert_link_credit_runs_out(Sender, Left) ->
             receive {amqp10_event, {link, Sender, credited}} ->
                         ct:pal("credited with ~b messages left", [Left]),
                         assert_link_credit_runs_out(Sender, Left - 1)
-<<<<<<< HEAD
-            after 500 ->
-=======
             after 1000 ->
->>>>>>> 42ede4a25 (Speed up tests)
                       ct:pal("insufficient link credit with ~b messages left", [Left]),
                       ok
             end