openstack
/
heat
Code Issues Proposed changes

Stop monkey-patching global namespace 

This leads to very hard to debug test failures when tests are run in
parallel.

Change-Id: Ied19e4bba31ef089e5a3d208d6e12b0c0dcaa777
This commit is contained in:
Pavlo Shchelokovskyy 2015-05-28 12:28:56 +00:00
parent 6cf94a3ece
commit d583d6e662
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/tests/test_nova_floatingip.py
View File

@ -69,8 +69,8 @@ class NovaFloatingIPTest(common.HeatTestCase):
self.m.StubOutWithMock(self.novaclient.servers, 'get')
self.m.StubOutWithMock(self.novaclient.servers, 'add_floating_ip')
self.m.StubOutWithMock(self.novaclient.servers, 'remove_floating_ip')
nova.NovaClientPlugin.get_server = mock.Mock(
return_value=mock.MagicMock())
self.patchobject(nova.NovaClientPlugin, 'get_server',
return_value=mock.MagicMock())
def _make_obj(self, **kwargs):
mock = self.m.CreateMockAnything()

4
heat/tests/test_restarter.py
View File

@ -49,8 +49,8 @@ class RestarterTest(common.HeatTestCase):
resource_defns = self.stack.t.resource_definitions(self.stack)
restarter = ha_restarter.Restarter(
'restarter', resource_defns['restarter'], self.stack)
nova.NovaClientPlugin.get_server = mock.Mock(
return_value=mock.MagicMock())
self.patchobject(nova.NovaClientPlugin, 'get_server',
return_value=mock.MagicMock())
restarter.handle_create = mock.Mock(return_value=None)
return restarter

4
heat/tests/test_software_deployment.py
View File

@ -141,8 +141,8 @@ class SoftwareDeploymentTest(common.HeatTestCase):
stack_user_project_id='65728b74-cfe7-4f17-9c15-11d4f686e591'
)
nova.NovaClientPlugin.get_server = mock.Mock(
return_value=mock.MagicMock())
self.patchobject(nova.NovaClientPlugin, 'get_server',
return_value=mock.MagicMock())
self.patchobject(sd.SoftwareDeployment, '_create_user')
self.patchobject(sd.SoftwareDeployment, '_create_keypair')
self.patchobject(sd.SoftwareDeployment, '_delete_user')