openstack/nova
Code Issues Proposed changes

Merge "Stop using mox stubs in test_evacuate.py"

Browse Source
This commit is contained in:
Jenkins
2016-10-10 14:39:15 +00:00
committed by Gerrit Code Review
parent 26fd2eabb0 493a3135ed
commit 354630e681
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nova/tests/unit/api/openstack/compute/test_evacuate.py
View File

@@ -62,12 +62,13 @@ class EvacuateTestV21(test.NoDBTestCase):
def setUp(self): def setUp(self):
super(EvacuateTestV21, self).setUp() super(EvacuateTestV21, self).setUp()
self.stubs.Set(compute_api.API, 'get', fake_compute_api_get) self.stub_out('nova.compute.api.API.get', fake_compute_api_get)
self.stubs.Set(compute_api.HostAPI, 'service_get_by_compute_host', self.stub_out('nova.compute.api.HostAPI.service_get_by_compute_host',
fake_service_get_by_compute_host) fake_service_get_by_compute_host)
self.UUID = uuid.uuid4() self.UUID = uuid.uuid4()
for _method in self._methods: for _method in self._methods:
self.stubs.Set(compute_api.API, _method, fake_compute_api) self.stub_out('nova.compute.api.API.%s' % _method,
fake_compute_api)
self._set_up_controller() self._set_up_controller()
self.admin_req = fakes.HTTPRequest.blank('', use_admin_context=True) self.admin_req = fakes.HTTPRequest.blank('', use_admin_context=True)
self.req = fakes.HTTPRequest.blank('') self.req = fakes.HTTPRequest.blank('')
@@ -110,7 +111,7 @@ class EvacuateTestV21(test.NoDBTestCase):
def fake_evacuate(*args, **kwargs): def fake_evacuate(*args, **kwargs):
raise exception.ComputeServiceInUse("Service still in use") raise exception.ComputeServiceInUse("Service still in use")
self.stubs.Set(compute_api.API, 'evacuate', fake_evacuate) self.stub_out('nova.compute.api.API.evacuate', fake_evacuate)
self._check_evacuate_failure(webob.exc.HTTPBadRequest, self._check_evacuate_failure(webob.exc.HTTPBadRequest,
{'host': 'my-host', {'host': 'my-host',
'onSharedStorage': 'False', 'onSharedStorage': 'False',