diff options
| author | Yong Tang <yong.tang.github@outlook.com> | 2018-02-23 02:22:19 +0000 |
|---|---|---|
| committer | Yong Tang <yong.tang.github@outlook.com> | 2018-02-23 15:22:42 +0000 |
| commit | ab1f90a379bfb781c821ba8210e76bfa5551ea60 (patch) | |
| tree | ede6d0a06ccd417d217cfd108feb9a759dd1010c | |
| parent | d41e06092dd228c2409c61b0d6ed60d2b83eb5c5 (diff) | |
| download | docker-py-ab1f90a379bfb781c821ba8210e76bfa5551ea60.tar.gz | |
Cleanup containers during the tests
This fix tries to clean up the containers during the tests
so that no pre-existing volumes left in docker integration tests.
This fix adds `-v` when removing containers, and makes sure
containers launched in non-daemon mode are removed.
This fix is realted to moby PR 36292
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
| -rw-r--r-- | tests/integration/base.py | 2 | ||||
| -rw-r--r-- | tests/integration/models_containers_test.py | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/integration/base.py b/tests/integration/base.py index c22126d..56c23ed 100644 --- a/tests/integration/base.py +++ b/tests/integration/base.py @@ -36,7 +36,7 @@ class BaseIntegrationTest(unittest.TestCase): pass for container in self.tmp_containers: try: - client.api.remove_container(container, force=True) + client.api.remove_container(container, force=True, v=True) except docker.errors.APIError: pass for network in self.tmp_networks: diff --git a/tests/integration/models_containers_test.py b/tests/integration/models_containers_test.py index f9f59c4..fac4de2 100644 --- a/tests/integration/models_containers_test.py +++ b/tests/integration/models_containers_test.py @@ -47,10 +47,13 @@ class ContainerCollectionTest(BaseIntegrationTest): self.tmp_containers.append(container.id) container.wait() + name = "container_volume_test" out = client.containers.run( "alpine", "cat /insidecontainer/test", - volumes=["%s:/insidecontainer" % path] + volumes=["%s:/insidecontainer" % path], + name=name ) + self.tmp_containers.append(name) assert out == b'hello\n' def test_run_with_named_volume(self): @@ -66,10 +69,13 @@ class ContainerCollectionTest(BaseIntegrationTest): self.tmp_containers.append(container.id) container.wait() + name = "container_volume_test" out = client.containers.run( "alpine", "cat /insidecontainer/test", - volumes=["somevolume:/insidecontainer"] + volumes=["somevolume:/insidecontainer"], + name=name ) + self.tmp_containers.append(name) assert out == b'hello\n' def test_run_with_network(self): |