openstack/heat
Code Issues Proposed changes

Remove mox usage from test_docker_container

Browse Source 
Change-Id: I331dfd937efad0dafed3aaa29b2d5a3d9741a4a6
goal: mox-removal
This commit is contained in:
ricolin 2018-04-01 22:48:35 +08:00
parent d00a068c5b
commit 1e3ddf11ff
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
contrib/heat_docker/heat_docker/tests/test_docker_container.py
View File

@ -59,7 +59,6 @@ class DockerContainerTest(common.HeatTestCase):
super(DockerContainerTest, self).setUp() super(DockerContainerTest, self).setUp()
for res_name, res_class in docker_container.resource_mapping().items(): for res_name, res_class in docker_container.resource_mapping().items():
resource._register_class(res_name, res_class) resource._register_class(res_name, res_class)
self.addCleanup(self.m.VerifyAll)
def create_container(self, resource_name): def create_container(self, resource_name):
t = template_format.parse(template) t = template_format.parse(template)
@ -68,11 +67,9 @@ class DockerContainerTest(common.HeatTestCase):
resource_name, resource_name,
self.stack.t.resource_definitions(self.stack)[resource_name], self.stack.t.resource_definitions(self.stack)[resource_name],
self.stack) self.stack)
self.m.StubOutWithMock(resource, 'get_client') self.patchobject(resource, 'get_client',
resource.get_client().MultipleTimes().AndReturn( return_value=docker.Client())
docker.Client())
self.assertIsNone(resource.validate()) self.assertIsNone(resource.validate())
self.m.ReplayAll()
scheduler.TaskRunner(resource.create)() scheduler.TaskRunner(resource.create)()
self.assertEqual((resource.CREATE, resource.COMPLETE), self.assertEqual((resource.CREATE, resource.COMPLETE),
resource.state) resource.state)
@ -99,11 +96,9 @@ class DockerContainerTest(common.HeatTestCase):
props['name'] = 'super-blog' props['name'] = 'super-blog'
resource = docker_container.DockerContainer( resource = docker_container.DockerContainer(
'Blog', definition.freeze(properties=props), self.stack) 'Blog', definition.freeze(properties=props), self.stack)
self.m.StubOutWithMock(resource, 'get_client') self.patchobject(resource, 'get_client',
resource.get_client().MultipleTimes().AndReturn( return_value=docker.Client())
docker.Client())
self.assertIsNone(resource.validate()) self.assertIsNone(resource.validate())
self.m.ReplayAll()
scheduler.TaskRunner(resource.create)() scheduler.TaskRunner(resource.create)()
self.assertEqual((resource.CREATE, resource.COMPLETE), self.assertEqual((resource.CREATE, resource.COMPLETE),
resource.state) resource.state)
@ -142,11 +137,9 @@ class DockerContainerTest(common.HeatTestCase):
props['links'] = {'db': 'mysql'} props['links'] = {'db': 'mysql'}
resource = docker_container.DockerContainer( resource = docker_container.DockerContainer(
'Blog', definition.freeze(properties=props), self.stack) 'Blog', definition.freeze(properties=props), self.stack)
self.m.StubOutWithMock(resource, 'get_client') self.patchobject(resource, 'get_client',
resource.get_client().MultipleTimes().AndReturn( return_value=docker.Client())
docker.Client())
self.assertIsNone(resource.validate()) self.assertIsNone(resource.validate())
self.m.ReplayAll()
scheduler.TaskRunner(resource.create)() scheduler.TaskRunner(resource.create)()
self.assertEqual((resource.CREATE, resource.COMPLETE), self.assertEqual((resource.CREATE, resource.COMPLETE),
resource.state) resource.state)
@ -188,7 +181,6 @@ class DockerContainerTest(common.HeatTestCase):
raise raise
self.assertIs(False, exists) self.assertIs(False, exists)
self.m.VerifyAll()
@testtools.skipIf(docker is None, 'docker-py not available') @testtools.skipIf(docker is None, 'docker-py not available')
def test_resource_delete_exception(self): def test_resource_delete_exception(self):
@ -197,18 +189,18 @@ class DockerContainerTest(common.HeatTestCase):
response.content = 'some content' response.content = 'some content'
container = self.create_container('Blog') container = self.create_container('Blog')
self.m.StubOutWithMock(container.get_client(), 'kill') self.patchobject(container.get_client(), 'kill',
container.get_client().kill(container.resource_id).AndRaise( side_effect=[docker.errors.APIError(
docker.errors.APIError('Not found', response)) 'Not found', response)])
self.m.StubOutWithMock(container, '_get_container_status')
container._get_container_status(container.resource_id).AndRaise(
docker.errors.APIError('Not found', response))
self.m.ReplayAll()
self.patchobject(container, '_get_container_status',
side_effect=[docker.errors.APIError(
'Not found', response)])
scheduler.TaskRunner(container.delete)() scheduler.TaskRunner(container.delete)()
self.m.VerifyAll() container.get_client().kill.assert_called_once_with(
container.resource_id)
container._get_container_status.assert_called_once_with(
container.resource_id)
def test_resource_suspend_resume(self): def test_resource_suspend_resume(self):
container = self.create_container('Blog') container = self.create_container('Blog')