openstack
/
neutron
Code Issues Proposed changes

Improve usage of MagicMocks in ML2 and L3 tests 

Removes usage of a MagicMock in a case where it's not needed.
Replaces a manual function replacement with a mock.patch call
so it's correctly cleaned up by mock.patch.stopall.

Partial-Bug: #1316401
Change-Id: I8f2f7e9eca2aeaa3b65be1b451e96ed2146950f4
This commit is contained in:
Kevin Benton 2014-05-06 04:19:08 +00:00
parent e65b06f458
commit 66a24ab397
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/tests/unit/ml2/test_rpcapi.py
View File

@ -38,11 +38,9 @@ class RpcApiTestCase(base.BaseTestCase):
if rpc_method == 'cast' and method == 'run_instance':
kwargs['call'] = False
rpc_method_mock = mock.Mock()
rpc_method_mock.return_value = expected_retval
setattr(rpc, rpc_method, rpc_method_mock)
retval = getattr(rpcapi, method)(ctxt, **kwargs)
with mock.patch.object(rpc, rpc_method) as rpc_method_mock:
rpc_method_mock.return_value = expected_retval
retval = getattr(rpcapi, method)(ctxt, **kwargs)
self.assertEqual(retval, expected_retval)

5
neutron/tests/unit/test_l3_plugin.py
View File

@ -1880,9 +1880,8 @@ class L3BaseForIntTests(test_db_plugin.NeutronDbPluginV2TestCase):
ext_mgr = ext_mgr or L3TestExtensionManager()
if self.mock_rescheduling:
rescheduling_patcher = mock.patch(
'%s._check_router_needs_rescheduling' % plugin)
rescheduling_patcher.start().return_value = False
mock.patch('%s._check_router_needs_rescheduling' % plugin,
new=lambda *a: False).start()
super(L3BaseForIntTests, self).setUp(plugin=plugin, ext_mgr=ext_mgr,
service_plugins=service_plugins)