Merge branch 'main' into copy_file_tests

Author: Tranquility2

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "4.14.1"
+    ".": "4.14.2"
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [4.14.2](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.14.1...testcontainers-v4.14.2) (2026-03-18)
+
+
+### Features
+
+* **kafka:** allow configurable listener name and security protocol ([#966](https://github.com/testcontainers/testcontainers-python/issues/966)) ([44dd40b](https://github.com/testcontainers/testcontainers-python/commit/44dd40b48c3a5020b487bae5d460124d9e594ac3))
+
 ## [4.14.1](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.14.0...testcontainers-v4.14.1) (2026-01-31)
 
 

Makefile

@@ -20,7 +20,10 @@ build:  ## Build the python package
 
 tests: ${TESTS}  ## Run tests for each package
 ${TESTS}: %/tests:
-	uv run coverage run --parallel -m pytest -v  $*/tests
+	uv run coverage run --parallel -m pytest -v $*/tests
+
+quick-core-tests:  ## Run core tests excluding long_running
+	uv run coverage run --parallel -m pytest -v -m "not long_running" core/tests
 
 coverage:  ## Target to combine and report coverage.
 	uv run coverage combine
@@ -61,7 +64,7 @@ clean-all: clean ## Remove all generated files and reset the local virtual envir
 	rm -rf .venv
 
 # Targets that do not generate file-level artifacts.
-.PHONY: clean docs doctests image tests ${TESTS}
+.PHONY: clean docs doctests image tests quick-core-tests ${TESTS}
 
 
 # Implements this pattern for autodocumenting Makefiles:

core/testcontainers/core/config.py

@@ -88,6 +88,8 @@ def read_tc_properties() -> dict[str, str]:
 
 @dataclass
 class TestcontainersConfiguration:
+    __test__ = False
+
     def _render_bool(self, env_name: str, prop_name: str) -> bool:
         env_val = environ.get(env_name, None)
         if env_val is not None:

core/testcontainers/core/container.py

@@ -87,6 +87,8 @@ def __init__(
             for vol in volumes:
                 self.with_volume_mapping(*vol)
 
+        self.tmpfs: dict[str, str] = {}
+
         self.image = image
         self._docker = DockerClient(**(docker_client_kw or {}))
         self._container: Optional[Container] = None
@@ -208,6 +210,7 @@ def start(self) -> Self:
             ports=cast("dict[int, Optional[int]]", self.ports),
             name=self._name,
             volumes=self.volumes,
+            tmpfs=self.tmpfs,
             **{**network_kwargs, **self._kwargs},
         )
 
@@ -284,6 +287,16 @@ def with_volume_mapping(self, host: Union[str, PathLike[str]], container: str, m
         self.volumes[str(host)] = mapping
         return self
 
+    def with_tmpfs_mount(self, container_path: str, size: Optional[str] = None) -> Self:
+        """Mount a tmpfs volume on the container.
+        
+        :param container_path: Container path to mount tmpfs on (e.g., '/data')
+        :param size: Optional size limit (e.g., '256m', '1g'). If None, unbounded.
+        :return: Self for chaining
+        """
+        self.tmpfs[container_path] = size or ""
+        return self
+
     def get_wrapped_container(self) -> "Container":
         return self._container
 

core/testcontainers/core/generic.py

@@ -29,6 +29,8 @@
 class DbContainer(DockerContainer):
     """
     **DEPRECATED (for removal)**
+    Please use database-specific container classes or `SqlContainer` instead.
+    # from testcontainers.generic.sql import SqlContainer
 
     Generic database container.
     """

core/tests/test_compose.py

@@ -1,3 +1,4 @@
+import logging
 import subprocess
 from pathlib import Path
 from re import split
@@ -150,7 +151,7 @@ def test_compose_logs():
         assert not line or container.Service in next(iter(line.split("|")))
 
 
-def test_compose_volumes():
+def test_compose_volumes(caplog):
     _file_in_volume = "/var/lib/example/data/hello"
     volumes = DockerCompose(context=FIXTURES / "basic_volume", keep_volumes=True)
     with volumes:
@@ -167,8 +168,11 @@ def test_compose_volumes():
     assert "hello" in stdout
 
     # third time we expect the file to be missing
-    with volumes, pytest.raises(subprocess.CalledProcessError):
-        volumes.exec_in_container(["cat", _file_in_volume], "alpine")
+    with caplog.at_level(
+        logging.CRITICAL, logger="testcontainers.compose.compose"
+    ):  # suppress expected error logs about missing volume
+        with volumes, pytest.raises(subprocess.CalledProcessError):
+            volumes.exec_in_container(["cat", _file_in_volume], "alpine")
 
 
 # noinspection HttpUrlsUsage

core/tests/test_docker_in_docker.py

@@ -179,6 +179,7 @@ def test_find_host_network_in_dood() -> None:
     assert DockerClient().find_host_network() == os.environ[EXPECTED_NETWORK_VAR]
 
 
+@pytest.mark.long_running
 @pytest.mark.skipif(
     is_mac(),
     reason="Docker socket mounting and container networking do not work reliably on Docker Desktop for macOS",
@@ -219,6 +220,7 @@ def test_dood(python_testcontainer_image: str) -> None:
     assert status["StatusCode"] == 0
 
 
+@pytest.mark.long_running
 @pytest.mark.skipif(
     is_mac(),
     reason="Docker socket mounting and container networking do not work reliably on Docker Desktop for macOS",

core/tests/test_ryuk.py

@@ -1,4 +1,4 @@
-from time import sleep
+from time import sleep, perf_counter
 import pytest
 from pytest import MonkeyPatch
 
@@ -12,6 +12,27 @@
 from testcontainers.core.waiting_utils import wait_for_logs
 
 
+def _wait_for_container_removed(client: DockerClient, container_id: str, timeout: float = 30) -> None:
+    """Poll until a container is fully removed (raises NotFound)."""
+    start = perf_counter()
+    while perf_counter() - start < timeout:
+        try:
+            client.containers.get(container_id)
+        except NotFound:
+            return
+        sleep(0.5)
+
+    try:
+        c = client.containers.get(container_id)
+        name = c.name
+        status = c.status
+        started_at = c.attrs.get("State", {}).get("StartedAt", "unknown")
+        detail = f"name={name}, status={status}, started_at={started_at}"
+    except NotFound:
+        detail = "container disappeared just after timeout"
+    raise TimeoutError(f"Container {container_id} was not removed within {timeout}s ({detail})")
+
+
 @pytest.mark.skipif(
     is_mac(),
     reason="Ryuk container reaping is unreliable on Docker Desktop for macOS due to VM-based container lifecycle handling",
@@ -39,8 +60,11 @@ def test_wait_for_reaper(monkeypatch: MonkeyPatch):
     assert rs
     rs.close()
 
-    sleep(0.6)  # Sleep until Ryuk reaps all dangling containers. 0.5 extra seconds for good measure.
+    # Ryuk will reap containers then auto-remove itself.
+    # Wait for the reaper container to disappear and once it's gone, all labeled containers are guaranteed reaped.
+    _wait_for_container_removed(docker_client, reaper_id)
 
+    # Verify both containers were reaped
     with pytest.raises(NotFound):
         docker_client.containers.get(container_id)
     with pytest.raises(NotFound):

core/tests/test_wait_strategies.py

@@ -1,3 +1,4 @@
+import logging
 import re
 import time
 from datetime import timedelta
@@ -528,7 +529,7 @@ def test_file_exists_wait_strategy_initialization(self, file_path):
     @patch("pathlib.Path.is_file")
     @patch("time.time")
     @patch("time.sleep")
-    def test_wait_until_ready(self, mock_sleep, mock_time, mock_is_file, file_exists, expected_behavior):
+    def test_wait_until_ready(self, mock_sleep, mock_time, mock_is_file, file_exists, expected_behavior, caplog):
         strategy = FileExistsWaitStrategy("/tmp/test.txt").with_startup_timeout(1)
         mock_container = Mock()
 
@@ -547,7 +548,8 @@ def test_wait_until_ready(self, mock_sleep, mock_time, mock_is_file, file_exists
             mock_is_file.assert_called()
         else:
             with pytest.raises(TimeoutError, match="File.*did not exist within.*seconds"):
-                strategy.wait_until_ready(mock_container)
+                with caplog.at_level(logging.CRITICAL, logger="testcontainers.core.wait_strategies"):
+                    strategy.wait_until_ready(mock_container)
 
 
 class TestCompositeWaitStrategy:
@@ -615,7 +617,7 @@ def test_wait_until_ready_all_strategies_succeed(self):
         strategy2.wait_until_ready.assert_called_once_with(mock_container)
         strategy3.wait_until_ready.assert_called_once_with(mock_container)
 
-    def test_wait_until_ready_first_strategy_fails(self):
+    def test_wait_until_ready_first_strategy_fails(self, caplog):
         """Test that execution stops when first strategy fails."""
         strategy1 = Mock()
         strategy2 = Mock()
@@ -628,7 +630,8 @@ def test_wait_until_ready_first_strategy_fails(self):
         strategy1.wait_until_ready.side_effect = TimeoutError("First strategy failed")
 
         with pytest.raises(TimeoutError, match="First strategy failed"):
-            composite.wait_until_ready(mock_container)
+            with caplog.at_level(logging.CRITICAL, logger="testcontainers.core.wait_strategies"):
+                composite.wait_until_ready(mock_container)
 
         # Only first strategy should be called
         strategy1.wait_until_ready.assert_called_once_with(mock_container)