Refactor to use DockerClient vs APIClient

* Update tests and framework
* remove tests for APIClient methods

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce
2020-11-11 16:47:05 -07:00
parent a65ecc70c2
commit a1187ee6f3
8 changed files with 188 additions and 219 deletions

View File

@ -1,21 +1,23 @@
from docker import APIClient
from docker import DockerClient
from test.python.docker import constant
def run_top_container(client: APIClient):
c = client.create_container(
def run_top_container(client: DockerClient):
c = client.containers.create(
constant.ALPINE, command="top", detach=True, tty=True, name="top"
)
client.start(c.get("Id"))
return c.get("Id")
c.start()
return c.id
def remove_all_containers(client: APIClient):
for ctnr in client.containers(quiet=True):
client.remove_container(ctnr, force=True)
def remove_all_containers(client: DockerClient):
for ctnr in client.containers.list(all=True):
ctnr.remove(force=True)
def remove_all_images(client: APIClient):
for image in client.images(quiet=True):
client.remove_image(image, force=True)
def remove_all_images(client: DockerClient):
for img in client.images.list():
# FIXME should DELETE /images accept the sha256: prefix?
id_ = img.id.removeprefix("sha256:")
client.images.remove(id_, force=True)