Merge "Remove redundant mock in functional test"

This commit is contained in:
Jenkins 2017-09-07 06:29:37 +00:00 committed by Gerrit Code Review
commit 27709e3bec

@ -90,14 +90,12 @@ class TestServers(v1_test.APITestV1):
"resources": {"CUSTOM_GOLD": 1}}
self.post_json('/flavors', body, headers=headers, status=201)
@mock.patch('mogan.scheduler.rpcapi.SchedulerAPI.select_destinations')
@mock.patch('oslo_utils.uuidutils.generate_uuid')
def _prepare_server(self, amount, mocked, mock_select_dest):
def _prepare_server(self, amount, mocked):
# NOTE(wanghao): Since we added quota reserve in creation option,
# there is one more generate_uuid out of provision_servers, so
# amount should *2 here.
mocked.side_effect = self.SERVER_UUIDS[:(amount * 2)]
mock_select_dest.return_value = mock.MagicMock()
responses = []
headers = self.gen_headers(self.context)
for i in six.moves.xrange(amount):