clean up tests, warnings, linting

Author: alexanderankin

core/testcontainers/core/config.py

@@ -61,9 +61,10 @@ class TestcontainersConfiguration:
 
     @property
     def docker_auth_config(self):
-        if "DOCKER_AUTH_CONFIG" in _WARNINGS:
+        config = self._docker_auth_config
+        if config and "DOCKER_AUTH_CONFIG" in _WARNINGS:
             warning(_WARNINGS.pop("DOCKER_AUTH_CONFIG"))
-        return self._docker_auth_config
+        return config
 
     @docker_auth_config.setter
     def docker_auth_config(self, value: str):

core/testcontainers/core/generic.py

@@ -94,16 +94,15 @@ class ServerContainer(DockerContainer):
 
     Example:
 
-    todo re-enable this test:
-    .. code-block::
+    .. doctest::
 
         >>> import httpx
         >>> from testcontainers.core.generic import ServerContainer
         >>> from testcontainers.core.waiting_utils import wait_for_logs
         >>> from testcontainers.core.image import DockerImage
 
         >>> with DockerImage(path="./core/tests/image_fixtures/python_server", tag="test-srv:latest") as image:
-        >>>     with ServerContainer(port=9000, image=image) as srv:
+        ...     with ServerContainer(port=9000, image=image) as srv:
         ...         url = srv._create_connection_url()
         ...         response = httpx.get(f"{url}", timeout=5)
         ...         assert response.status_code == 200, "Response status code is not 200"

core/testcontainers/core/image.py

@@ -1,4 +1,5 @@
-from typing import TYPE_CHECKING, Optional
+from os import PathLike
+from typing import TYPE_CHECKING, Optional, Union
 
 from typing_extensions import Self
 
@@ -28,7 +29,7 @@ class DockerImage:
 
     def __init__(
         self,
-        path: str,
+        path: Union[str, PathLike],
         docker_client_kw: Optional[dict] = None,
         tag: Optional[str] = None,
         clean_up: bool = True,
@@ -45,7 +46,7 @@ def __init__(
     def build(self, **kwargs) -> Self:
         logger.info(f"Building image from {self.path}")
         docker_client = self.get_docker_client()
-        self._image, self._logs = docker_client.build(path=self.path, tag=self.tag, **kwargs)
+        self._image, self._logs = docker_client.build(path=str(self.path), tag=self.tag, **kwargs)
         logger.info(f"Built image {self.short_id} with tag {self.tag}")
         return self
 

core/tests/image_fixtures/python_server/Dockerfile

@@ -1,3 +1,3 @@
-FROM python:3
+FROM python:3-alpine
 EXPOSE 9000
 CMD ["python", "-m", "http.server", "9000"]

core/tests/test_generics.py

@@ -1,21 +1,31 @@
-import pytest
+import re
+from pathlib import Path
 from typing import Optional
+
+import pytest
+from httpx import get
+
+from testcontainers.core.waiting_utils import wait_for_logs
+from testcontainers.core.image import DockerImage
 from testcontainers.core.generic import ServerContainer
 
-import re
+TEST_DIR = Path(__file__).parent
 
 
 @pytest.mark.parametrize("test_image_cleanup", [True, False])
 @pytest.mark.parametrize("test_image_tag", [None, "custom-image:test"])
 def test_srv_container(test_image_tag: Optional[str], test_image_cleanup: bool, check_for_image, port=9000):
-    with ServerContainer(
-        path="./core/tests/image_fixtures/python_server",
-        port=port,
-        tag=test_image_tag,
-        image_cleanup=test_image_cleanup,
-    ) as srv:
-        image_short_id = srv.docker_image.short_id
-        image_build_logs = srv.docker_image.get_logs()
+    with (
+        DockerImage(
+            path=TEST_DIR / "image_fixtures/python_server",
+            tag=test_image_tag,
+            clean_up=test_image_cleanup,
+            #
+        ) as docker_image,
+        ServerContainer(port=port, image=docker_image) as srv,
+    ):
+        image_short_id = docker_image.short_id
+        image_build_logs = docker_image.get_logs()
         # check if dict is in any of the logs
         assert {"stream": f"Step 2/3 : EXPOSE {port}"} in image_build_logs, "Image logs mismatch"
         assert (port, None) in srv.ports.items(), "Port mismatch"
@@ -25,3 +35,13 @@ def test_srv_container(test_image_tag: Optional[str], test_image_cleanup: bool,
         assert re.match(r"http://localhost:\d+", test_url), "Connection URL mismatch"
 
     check_for_image(image_short_id, test_image_cleanup)
+
+
+def test_like_doctest():
+    with DockerImage(path=TEST_DIR / "image_fixtures/python_server", tag="test-srv:latest") as image:
+        with ServerContainer(port=9000, image=image) as srv:
+            url = srv._create_connection_url()
+            response = get(f"{url}", timeout=5)
+            assert response.status_code == 200, "Response status code is not 200"
+            delay = wait_for_logs(srv, "GET / HTTP/1.1")
+            print(delay)

poetry.lock

@@ -140,19 +140,20 @@ mypy = "1.7.1"
 pre-commit = "^3.6"
 pytest = "7.4.3"
 pytest-cov = "4.1.0"
-sphinx = "^7.2.6"
-twine = "^4.0.2"
-anyio = "^4.3.0"
+sphinx = "7.2.6"
+twine = "4.0.2"
+anyio = "4.3.0"
 # for tests only
-psycopg2-binary = "*"
-pg8000 = "*"
-sqlalchemy = "*"
-psycopg = "*"
-cassandra-driver = "*"
+psycopg2-binary = "2.9.9"
+pg8000 = "1.30.5"
+sqlalchemy = "2.0.28"
+psycopg = "3.1.18"
+cassandra-driver = "3.29.1"
 pytest-asyncio = "0.23.5"
 kafka-python-ng = "^2.2.0"
-hvac = "*"
+hvac = "2.1.0"
 pymilvus = "2.4.3"
+httpx = "0.27.0"
 
 [[tool.poetry.source]]
 name = "PyPI"