Use finally in context manager (#58)

* Use `finally` in context manager * Version 0.10.3 * Update CHANGELOG.md Co-authored-by: Max <Luminaar@users.noreply.github.com>
avast · Jun 14, 2021 · 62c20fe · 62c20fe
1 parent b29309b
commit 62c20fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.10.3
+Changes:
+- Ensure that Docker cleanup is executed even with after tests have failed
+
 ## Version 0.10.2
 Changes:
 - Allow higher version of `attrs` (21.0)

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-docker
-version =  0.10.2
+version =  0.10.3
 description = Simple pytest fixtures for Docker and docker-compose based tests
 long_description = file: README.md
 long_description_content_type = text/markdown

diff --git a/src/pytest_docker/plugin.py b/src/pytest_docker/plugin.py
@@ -168,11 +168,12 @@ def get_docker_services(
     # Spawn containers.
     docker_compose.execute("up --build -d")
 
-    # Let test(s) run.
-    yield Services(docker_compose)
-
-    # Clean up.
-    docker_compose.execute(docker_cleanup)
+    try:
+        # Let test(s) run.
+        yield Services(docker_compose)
+    finally:
+        # Clean up.
+        docker_compose.execute(docker_cleanup)
 
 
 @pytest.fixture(scope="session")