diff --git a/go.mod b/go.mod index 4207709..671c84a 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/michaelklishin/rabbit-hole/v3 require ( github.com/onsi/ginkgo/v2 v2.22.0 - github.com/onsi/gomega v1.35.1 + github.com/onsi/gomega v1.36.0 github.com/rabbitmq/amqp091-go v1.10.0 ) diff --git a/go.sum b/go.sum index 9151ce1..56cc3a6 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= -github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y= +github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw= diff --git a/rabbithole_test.go b/rabbithole_test.go index 4034a88..62623f1 100644 --- a/rabbithole_test.go +++ b/rabbithole_test.go @@ -4170,7 +4170,10 @@ var _ = Describe("RabbitMQ HTTP API client", func() { list, err := rmqc.ListGlobalParameters() Ω(err).Should(BeNil()) Ω(list).To(SatisfyAll( - HaveLen(4), // cluster_name and internal_cluster_id are set by default by RabbitMQ + // RabbitMQ 4.0.x and later versions will have an + // extra global runtime parameter by default, see + // https://github.com/rabbitmq/rabbitmq-server/issues/12552 + Or(HaveLen(5), HaveLen(4)), ContainElements( GlobalRuntimeParameter{ Name: "a-name", @@ -4193,7 +4196,10 @@ var _ = Describe("RabbitMQ HTTP API client", func() { Ω(err).Should(BeNil()) return len(xs) - }).Should(Equal(2)) + // RabbitMQ 4.0.x and later versions will have an + // extra global runtime parameter by default, see + // https://github.com/rabbitmq/rabbitmq-server/issues/12552 + }).Should(Or(Equal(3), Equal(2))) }) }) })