fix(core): make sure context manager exits (#876)

maybe don't write your software in python

Author: alexanderankin

.github/workflows/ci-core.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install Python dependencies
         run: poetry install --all-extras
       - name: Run twine check
-        run: poetry build && poetry run twine check dist/*.tar.gz
+        run: rm -f LICENSE.txt && poetry build && poetry run twine check dist/*.tar.gz
       - name: Set up Docker
         uses: docker/setup-docker-action@v4
       - name: Run tests

core/testcontainers/compose/compose.py

@@ -1,3 +1,4 @@
+import sys
 from dataclasses import asdict, dataclass, field, fields, is_dataclass
 from functools import cached_property
 from json import loads
@@ -223,8 +224,12 @@ def __post_init__(self) -> None:
             self.env_file = [self.env_file]
 
     def __enter__(self) -> "DockerCompose":
-        self.start()
-        return self
+        try:
+            self.start()
+            return self
+        except:  # noqa: E722, RUF100
+            self.__exit__(*sys.exc_info())
+            raise
 
     def __exit__(
         self, exc_type: Optional[type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]

core/testcontainers/core/container.py

@@ -1,4 +1,5 @@
 import contextlib
+import sys
 from os import PathLike
 from socket import socket
 from types import TracebackType
@@ -215,7 +216,11 @@ def stop(self, force: bool = True, delete_volume: bool = True) -> None:
         self.get_docker_client().client.close()
 
     def __enter__(self) -> Self:
-        return self.start()
+        try:
+            return self.start()
+        except:  # noqa: E722, RUF100
+            self.__exit__(*sys.exc_info())
+            raise
 
     def __exit__(
         self, exc_type: Optional[type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]

pyproject.toml

@@ -10,6 +10,7 @@ maintainers = [
 ]
 readme = "README.md"
 keywords = ["testing", "logging", "docker", "test automation"]
+license = "Apache-2.0"
 classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Intended Audience :: Information Technology",