Merge "Revert "Re-enable update container test""

This commit is contained in:
Zuul 2018-05-16 19:47:46 +00:00 committed by Gerrit Code Review
commit b3e893aeab

View File

@ -428,10 +428,11 @@ class TestContainer(base.BaseZunTest):
self.assertEqual(200, resp.status)
self.assertTrue('hello' in encodeutils.safe_decode(body))
@decorators.skip_because(bug="1764923")
@decorators.idempotent_id('d383f359-3ebd-40ef-9dc5-d36922790230')
def test_update_container(self):
_, model = self._run_container(cpu=0.1, memory=100)
self.assertEqual('100', model.memory)
self.assertEqual('100M', model.memory)
self.assertEqual(0.1, model.cpu)
docker_base_url = self._get_docker_url(model)
container = self.docker_client.get_container(model.uuid,
@ -442,7 +443,7 @@ class TestContainer(base.BaseZunTest):
resp, model = self.container_client.update_container(model.uuid,
gen_model)
self.assertEqual(200, resp.status)
self.assertEqual('200', model.memory)
self.assertEqual('200M', model.memory)
self.assertEqual(0.2, model.cpu)
container = self.docker_client.get_container(model.uuid,
docker_base_url)