openstack/zun-tempest-plugin
Code Issues Proposed changes

Merge "Handle the case that the time is zero"

Browse Source
This commit is contained in:
Jenkins 2017-03-13 10:47:29 +00:00 committed by Gerrit Code Review
commit 0cf4cc46d6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zun_tempest_plugin/tests/tempest/api/test_containers.py
View File

@ -182,13 +182,13 @@ class TestContainer(base.BaseZunTest):
self.assertEqual(202, resp.status) self.assertEqual(202, resp.status)
# Wait for container to finish creation # Wait for container to finish creation
self.container_client.ensure_container_in_desired_state( self.container_client.ensure_container_in_desired_state(
model.uuid, 'Stopped') model.uuid, 'Created')
# Assert the container is created # Assert the container is created
resp, model = self.container_client.get_container(model.uuid) resp, model = self.container_client.get_container(model.uuid)
self.assertEqual(200, resp.status) self.assertEqual(200, resp.status)
self.assertEqual('Stopped', model.status) self.assertEqual('Created', model.status)
self.assertEqual('Stopped', self._get_container_state(model.uuid)) self.assertEqual('Created', self._get_container_state(model.uuid))
return resp, model return resp, model
def _run_container(self, **kwargs): def _run_container(self, **kwargs):
@ -220,5 +220,7 @@ class TestContainer(base.BaseZunTest):
return 'Paused' return 'Paused'
elif status.get('Running'): elif status.get('Running'):
return 'Running' return 'Running'
elif status.get('Status') == 'created':
return 'Created'
else: else:
return 'Stopped' return 'Stopped'