Merge "Replace 'MagicMock' with 'Mock'"

This commit is contained in:
Jenkins 2016-09-22 15:53:08 +00:00 committed by Gerrit Code Review
commit 8e8885e400
1 changed files with 1 additions and 1 deletions

View File

@ -575,7 +575,7 @@ class ClusterControllerTest(shared.ControllerTest, base.SenlinTestCase):
req = self._post('/clusters', jsonutils.dumps(body))
error = senlin_exc.HTTPExceptionDisguise(webob.exc.HTTPBadRequest())
self.controller.create = mock.MagicMock(side_effect=error)
self.controller.create = mock.Mock(side_effect=error)
resp = shared.request_with_middleware(fault.FaultWrapper,
self.controller.create, req,