docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Yong Tang 2018-02-23 02:22:19 +00:00
parent d41e06092d
commit ab1f90a379
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/base.py
View File

@ -36,7 +36,7 @@ class BaseIntegrationTest(unittest.TestCase):
pass pass
for container in self.tmp_containers: for container in self.tmp_containers:
try: try:
client.api.remove_container(container, force=True) client.api.remove_container(container, force=True, v=True)
except docker.errors.APIError: except docker.errors.APIError:
pass pass
for network in self.tmp_networks: for network in self.tmp_networks:

10
tests/integration/models_containers_test.py
View File

@ -47,10 +47,13 @@ class ContainerCollectionTest(BaseIntegrationTest):
self.tmp_containers.append(container.id) self.tmp_containers.append(container.id)
container.wait() container.wait()
name = "container_volume_test"
out = client.containers.run( out = client.containers.run(
"alpine", "cat /insidecontainer/test", "alpine", "cat /insidecontainer/test",
volumes=["%s:/insidecontainer" % path] volumes=["%s:/insidecontainer" % path],
name=name
) )
self.tmp_containers.append(name)
assert out == b'hello\n' assert out == b'hello\n'
def test_run_with_named_volume(self): def test_run_with_named_volume(self):
@ -66,10 +69,13 @@ class ContainerCollectionTest(BaseIntegrationTest):
self.tmp_containers.append(container.id) self.tmp_containers.append(container.id)
container.wait() container.wait()
name = "container_volume_test"
out = client.containers.run( out = client.containers.run(
"alpine", "cat /insidecontainer/test", "alpine", "cat /insidecontainer/test",
volumes=["somevolume:/insidecontainer"] volumes=["somevolume:/insidecontainer"],
name=name
) )
self.tmp_containers.append(name)
assert out == b'hello\n' assert out == b'hello\n'
def test_run_with_network(self): def test_run_with_network(self):