From 63cbd63cc9510d70d182c40a97944650098d2fda Mon Sep 17 00:00:00 2001 From: jda Date: Fri, 28 Jul 2023 14:45:25 +0200 Subject: [PATCH 1/2] fix: rabbitmq readiness probe Add pika AMQPConnectionError to transient errors --- modules/rabbitmq/testcontainers/rabbitmq/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/rabbitmq/testcontainers/rabbitmq/__init__.py b/modules/rabbitmq/testcontainers/rabbitmq/__init__.py index 6c26518c8..77a4b2ea2 100644 --- a/modules/rabbitmq/testcontainers/rabbitmq/__init__.py +++ b/modules/rabbitmq/testcontainers/rabbitmq/__init__.py @@ -51,7 +51,9 @@ def __init__( self.with_env("RABBITMQ_DEFAULT_USER", self.username) self.with_env("RABBITMQ_DEFAULT_PASS", self.password) - @wait_container_is_ready(pika.exceptions.IncompatibleProtocolError) + @wait_container_is_ready( + pika.exceptions.IncompatibleProtocolError, pika.exceptions.AMQPConnectionError + ) def readiness_probe(self) -> bool: """Test if the RabbitMQ broker is ready.""" connection = pika.BlockingConnection(self.get_connection_params()) @@ -66,7 +68,9 @@ def get_connection_params(self) -> pika.ConnectionParameters: For more details see: https://pika.readthedocs.io/en/latest/modules/parameters.html """ - credentials = pika.PlainCredentials(username=self.username, password=self.password) + credentials = pika.PlainCredentials( + username=self.username, password=self.password + ) return pika.ConnectionParameters( host=self.get_container_host_ip(), From 1f34e1477c41c6758df8f257d2973b716274a7ce Mon Sep 17 00:00:00 2001 From: David Ankin Date: Mon, 4 Mar 2024 12:10:05 -0500 Subject: [PATCH 2/2] fix linting --- modules/rabbitmq/testcontainers/rabbitmq/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/rabbitmq/testcontainers/rabbitmq/__init__.py b/modules/rabbitmq/testcontainers/rabbitmq/__init__.py index 77a4b2ea2..0a5486025 100644 --- a/modules/rabbitmq/testcontainers/rabbitmq/__init__.py +++ b/modules/rabbitmq/testcontainers/rabbitmq/__init__.py @@ -51,9 +51,7 @@ def __init__( self.with_env("RABBITMQ_DEFAULT_USER", self.username) self.with_env("RABBITMQ_DEFAULT_PASS", self.password) - @wait_container_is_ready( - pika.exceptions.IncompatibleProtocolError, pika.exceptions.AMQPConnectionError - ) + @wait_container_is_ready(pika.exceptions.IncompatibleProtocolError, pika.exceptions.AMQPConnectionError) def readiness_probe(self) -> bool: """Test if the RabbitMQ broker is ready.""" connection = pika.BlockingConnection(self.get_connection_params()) @@ -68,9 +66,7 @@ def get_connection_params(self) -> pika.ConnectionParameters: For more details see: https://pika.readthedocs.io/en/latest/modules/parameters.html """ - credentials = pika.PlainCredentials( - username=self.username, password=self.password - ) + credentials = pika.PlainCredentials(username=self.username, password=self.password) return pika.ConnectionParameters( host=self.get_container_host_ip(),