Test container delete without 'force'

Remove the force parameter on deleting container. This will verify
container deletion in common scenario.

Change-Id: I5792a5d47ad66459d12c071e6f75034d465cea2f
This commit is contained in:
Hongbin Lu 2017-12-01 04:39:52 +00:00
parent e502cad7dd
commit 3a1e06d279

View File

@ -460,12 +460,7 @@ class TestContainer(base.BaseZunTest):
return resp, model
def _delete_container(self, container_id, container_host, force=False):
# NOTE(kiennt): From version 1.7, Zun disallowed non-admin users
# to force delete containers. Therefore, we
# have to be admin to do this action.
resp, _ = self.os_admin.container_client.delete_container(
container_id,
params={'force': force, 'all_tenants': True})
resp, _ = self.container_client.delete_container(container_id)
self.assertEqual(204, resp.status)
self.container_client.ensure_container_deleted(container_id)
container = self.docker_client.get_container(