From ee0b5b5f323abd23f1ec758aea5b5ab344b3c393 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien.pedron@dumbbell.fr>
Date: Fri, 14 Feb 2025 11:41:57 +0100
Subject: [PATCH 1/4] rabbit_stream_queue_SUITE: Fix recursion issue

... in retry_if_coordinator_unavailable().
---
 deps/rabbit/test/rabbit_stream_queue_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
index d56e5c8b096f..d9ff47230b6c 100644
--- a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
+++ b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
@@ -2743,7 +2743,7 @@ retry_if_coordinator_unavailable(Config, Server, Cmd, Retry) ->
             case re:run(Msg, ".*coordinator_unavailable.*", [{capture, none}]) of
                 match ->
                     ct:pal("Attempt to execute command ~p failed, coordinator unavailable", [Cmd]),
-                    retry_if_coordinator_unavailable(Config, Ch, Cmd, Retry - 1);
+                    retry_if_coordinator_unavailable(Config, Server, Cmd, Retry - 1);
                 _ ->
                     exit(Error)
             end

From b7c9e648ea7f72d9ede3cfa2efec1d9f25f97c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien.pedron@dumbbell.fr>
Date: Fri, 14 Feb 2025 14:56:20 +0100
Subject: [PATCH 2/4] amqp_auth_SUITE: Handle error in init_per_group/2

---
 deps/rabbit/test/amqp_auth_SUITE.erl | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/deps/rabbit/test/amqp_auth_SUITE.erl b/deps/rabbit/test/amqp_auth_SUITE.erl
index 5889cbdd5003..389a37b2d5c7 100644
--- a/deps/rabbit/test/amqp_auth_SUITE.erl
+++ b/deps/rabbit/test/amqp_auth_SUITE.erl
@@ -120,12 +120,17 @@ init_per_group(Group, Config0) ->
                Config1,
                rabbit_ct_broker_helpers:setup_steps() ++
                rabbit_ct_client_helpers:setup_steps()),
-    Vhost = <<"test vhost">>,
-    User = <<"test user">>,
-    ok = rabbit_ct_broker_helpers:add_vhost(Config, Vhost),
-    ok = rabbit_ct_broker_helpers:add_user(Config, User),
-    [{test_vhost, Vhost},
-     {test_user, User}] ++ Config.
+    case Config of
+        _ when is_list(Config) ->
+            Vhost = <<"test vhost">>,
+            User = <<"test user">>,
+            ok = rabbit_ct_broker_helpers:add_vhost(Config, Vhost),
+            ok = rabbit_ct_broker_helpers:add_user(Config, User),
+            [{test_vhost, Vhost},
+             {test_user, User}] ++ Config;
+        {skip, _} = Skip ->
+            Skip
+    end.
 
 end_per_group(_Group, Config) ->
     ok = rabbit_ct_broker_helpers:delete_user(Config, ?config(test_user, Config)),

From 64b68e5d9ceb85bf7b6fb3391c4ed0136b361b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien.pedron@dumbbell.fr>
Date: Fri, 14 Feb 2025 15:23:50 +0100
Subject: [PATCH 3/4] unit_credit_flow_SUITE: Greatly reduce time trap

---
 deps/rabbit/test/unit_credit_flow_SUITE.erl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/deps/rabbit/test/unit_credit_flow_SUITE.erl b/deps/rabbit/test/unit_credit_flow_SUITE.erl
index 189d0287290d..bdc3a0679b85 100644
--- a/deps/rabbit/test/unit_credit_flow_SUITE.erl
+++ b/deps/rabbit/test/unit_credit_flow_SUITE.erl
@@ -11,6 +11,9 @@
 
 -compile(export_all).
 
+suite() ->
+    [{timetrap, {minutes, 3}}].
+
 all() ->
     [
       {group, sequential_tests}

From a5f30ea02ea1576e432c4e6086e0093b80db4b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?=
 <jean-sebastien.pedron@dumbbell.fr>
Date: Fri, 14 Feb 2025 15:36:07 +0100
Subject: [PATCH 4/4] GitHub workflows: List open TCP ports

This may help debug nodes that try to open busy ports.
---
 .github/workflows/test-make-target.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-make-target.yaml b/.github/workflows/test-make-target.yaml
index 4d9e466dc362..690904c211f9 100644
--- a/.github/workflows/test-make-target.yaml
+++ b/.github/workflows/test-make-target.yaml
@@ -90,6 +90,7 @@ jobs:
     - name: RUN TESTS
       if: inputs.plugin != 'rabbitmq_cli'
       run: |
+        sudo netstat -ntp
         make -C deps/${{ inputs.plugin }} ${{ inputs.make_target }} RABBITMQ_METADATA_STORE=${{ inputs.metadata_store }}
 
     # rabbitmq_cli needs a correct broker version for two of its tests.