Merge branch 'main' into feature/857

Author: Tranquility2

docs/features/wait_strategies.md

@@ -4,19 +4,17 @@ Testcontainers-Python provides several strategies to wait for containers to be r
 
 ## Basic Wait Strategy
 
-The simplest way to wait for a container is using the `wait_container_is_ready` decorator:
+The simplest way to wait for a container is using a structured wait strategy:
 
 ```python
-from testcontainers.core.waiting_utils import wait_container_is_ready
+from testcontainers.core.wait_strategies import HttpWaitStrategy
 
 class MyContainer(DockerContainer):
-    @wait_container_is_ready()
     def _connect(self):
-        # Your connection logic here
-        pass
+        HttpWaitStrategy(8080).wait_until_ready(self)
 ```
 
-This decorator will retry the method until it succeeds or times out. By default, it will retry for 120 seconds with a 1-second interval between attempts.
+The strategy will retry until it succeeds or times out. By default, it will retry for 120 seconds with a 1-second interval between attempts.
 
 ## Log-based Waiting
 

modules/generic/testcontainers/generic/server.py

@@ -1,13 +1,11 @@
 from typing import Union
-from urllib.error import HTTPError, URLError
-from urllib.request import urlopen
 
 import httpx
 
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.exceptions import ContainerStartException
 from testcontainers.core.image import DockerImage
-from testcontainers.core.waiting_utils import wait_container_is_ready
+from testcontainers.core.wait_strategies import HttpWaitStrategy
 
 
 class ServerContainer(DockerContainer):
@@ -40,19 +38,9 @@ def __init__(self, port: int, image: Union[str, DockerImage]) -> None:
         self.internal_port = port
         self.with_exposed_ports(self.internal_port)
 
-    @wait_container_is_ready(HTTPError, URLError)
     def _connect(self) -> None:
-        # noinspection HttpUrlsUsage
-        url = self._create_connection_url()
-        try:
-            with urlopen(url) as r:
-                assert b"" in r.read()
-        except HTTPError as e:
-            # 404 is expected, as the server may not have the specific endpoint we are looking for
-            if e.code == 404:
-                pass
-            else:
-                raise
+        strategy = HttpWaitStrategy(self.internal_port).for_status_code(404)
+        strategy.wait_until_ready(self)
 
     def get_api_url(self) -> str:
         raise NotImplementedError

modules/kafka/testcontainers/kafka/_redpanda.py

@@ -1,11 +1,12 @@
 import os.path
+import re
 import tarfile
 import time
 from io import BytesIO
 from textwrap import dedent
 
 from testcontainers.core.container import DockerContainer
-from testcontainers.core.waiting_utils import wait_for_logs
+from testcontainers.core.wait_strategies import LogMessageWaitStrategy
 
 
 class RedpandaContainer(DockerContainer):
@@ -34,6 +35,7 @@ def __init__(
         self.redpanda_port = 9092
         self.schema_registry_port = 8081
         self.with_exposed_ports(self.redpanda_port, self.schema_registry_port)
+        self.wait_for: re.Pattern[str] = re.compile(r".*Started Kafka API server.*")
 
     def get_bootstrap_server(self) -> str:
         host = self.get_container_host_ip()
@@ -70,7 +72,9 @@ def start(self, timeout=10) -> "RedpandaContainer":
         self.with_command(command)
         super().start()
         self.tc_start()
-        wait_for_logs(self, r".*Started Kafka API server.*", timeout=timeout)
+        wait_strategy = LogMessageWaitStrategy(self.wait_for)
+        wait_strategy.with_startup_timeout(timeout)
+        wait_strategy.wait_until_ready(self)
         return self
 
     def create_file(self, content: bytes, path: str) -> None:

modules/kafka/tests/test_redpanda.py

@@ -13,7 +13,7 @@ def test_redpanda_producer_consumer():
         produce_and_consume_message(container)
 
 
-@pytest.mark.parametrize("version", ["v23.1.13", "v23.3.10"])
+@pytest.mark.parametrize("version", ["v23.1.13", "v25.3.6"])
 def test_redpanda_confluent_version(version):
     with RedpandaContainer(image=f"docker.redpanda.com/redpandadata/redpanda:{version}") as container:
         produce_and_consume_message(container)