fixup

Author: matthiasschaub

core/testcontainers/core/container.py

@@ -88,6 +88,7 @@ def maybe_emulate_amd64(self) -> Self:
         return self
 
     def start(self) -> Self:
+        breakpoint()
         def _start():
             docker_client = self.get_docker_client()
             self._container = docker_client.run(
@@ -146,8 +147,7 @@ def _start():
     def stop(self, force=True, delete_volume=True) -> None:
         if self._container:
             if self._reuse and c.reuse_enabled:
-                #self._container.stop()
-                return
+                self._container.stop()
             else:
                 self._container.remove(force=force, v=delete_volume)
         self.get_docker_client().client.close()

core/tests/test_reusable_containers.py

@@ -20,10 +20,21 @@ def test_docker_container_with_reuse_reuse_disabled():
     assert id not in [container.id for container in containers]
 
 
-def test_docker_container_with_reuse_reuse_enabled(monkeypatch):
+def test_docker_container_with_reuse_reuse_enabled_ryuk_enabled(monkeypatch):
+    monkeypatch.setattr("testcontainers.core.config.testcontainers_config.reuse_enabled", True)
+    with DockerContainer("hello-world").with_reuse() as container:
+        assert container._reuse == True
+        id = container._container.id
+    containers = DockerClient().client.containers.list(all=True)
+    assert id in [container.id for container in containers]
+
+
+# TODO: do not run test while ryuk is running
+# TODO: clean up container after test run
+def test_docker_container_with_reuse_reuse_enabled_ryuk_diabled(monkeypatch):
     monkeypatch.setattr("testcontainers.core.config.testcontainers_config.reuse_enabled", True)
     monkeypatch.setattr("testcontainers.core.config.testcontainers_config.ryuk_disabled", True)
-    with DockerContainer("postgres", auto_remove=False).with_reuse() as container:
+    with DockerContainer("hello-world").with_reuse() as container:
         assert container._reuse == True
         id = container._container.id
     containers = DockerClient().client.containers.list(all=True)