From e291084f33aaa83846418f375068109914de4cf9 Mon Sep 17 00:00:00 2001
From: Anton Shepilov <anton.shepilov@gmail.com>
Date: Wed, 16 Sep 2026 14:36:16 +0200
Subject: [PATCH] fix(testutils): wait for rabbitmq amqp readiness

Wait for a successful AMQP handshake before returning the RabbitMQ
fixture after startup or restart. Checking TCP and HTTP availability
alone does not verify AMQP readiness.
---
 tests/testutils/rabbitmq_utils.go      | 17 ++++++++++++++++
 tests/testutils/rabbitmq_utils_test.go | 27 ++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/testutils/rabbitmq_utils_test.go

diff --git a/tests/testutils/rabbitmq_utils.go b/tests/testutils/rabbitmq_utils.go
index 109b041add2..d963688cc65 100644
--- a/tests/testutils/rabbitmq_utils.go
+++ b/tests/testutils/rabbitmq_utils.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/docker/go-connections/nat"
 	amqp "github.com/rabbitmq/amqp091-go"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	c "github.com/docker/docker/api/types/container"
@@ -138,6 +139,7 @@ func StartRabbitMQ(t *testing.T, withVolume bool, enableTLS bool) *RabbitFixture
 		_ = exec.Command("docker", "volume", "rm", volName).Run()
 	})
 
+	fixture.waitForAMQP(60 * time.Second)
 	return fixture
 }
 
@@ -191,6 +193,21 @@ func (f *RabbitFixture) Restart(ctx context.Context, timeout time.Duration) {
 	if f.AMQPSURL != "" {
 		f.t.Logf("AMQPS: %s", f.AMQPSURL)
 	}
+	f.waitForAMQP(timeout)
+}
+
+func (f *RabbitFixture) waitForAMQP(timeout time.Duration) {
+	f.t.Helper()
+
+	// Open ports and the management API do not guarantee an AMQP handshake succeeds.
+	require.EventuallyWithT(f.t, func(t *assert.CollectT) {
+		conn, err := amqp.DialConfig(f.AMQPURL, amqp.Config{
+			Dial: amqp.DefaultDial(time.Second),
+		})
+		if assert.NoError(t, err) {
+			assert.NoError(t, conn.Close())
+		}
+	}, timeout, 100*time.Millisecond, "RabbitMQ did not become ready for AMQP connections")
 }
 
 func (f *RabbitFixture) Stop(ctx context.Context, timeout time.Duration) {
diff --git a/tests/testutils/rabbitmq_utils_test.go b/tests/testutils/rabbitmq_utils_test.go
new file mode 100644
index 00000000000..bdbbc4c53cb
--- /dev/null
+++ b/tests/testutils/rabbitmq_utils_test.go
@@ -0,0 +1,27 @@
+package testutils
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestRabbitMQReadiness(t *testing.T) {
+	if testing.Short() {
+		t.Skip("integration test skipped with --short")
+	}
+
+	mq := StartRabbitMQ(t, false, false)
+	checkConnection := func(t *testing.T) {
+		conn, ch := CreateRabbitConnection(t, mq)
+		defer conn.Close()
+		require.NoError(t, ch.Close())
+	}
+
+	t.Run("Start", checkConnection)
+	mq.Stop(context.Background(), 30*time.Second)
+	mq.Restart(context.Background(), 30*time.Second)
+	t.Run("Restart", checkConnection)
+}