From: Kevin Benton Date: Tue, 6 May 2014 04:19:08 +0000 (+0000) Subject: Improve usage of MagicMocks in ML2 and L3 tests X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=66a24ab397e26963fef99d58f3f8ee2c9a6a52eb;p=openstack-build%2Fneutron-build.git 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 --- diff --git a/neutron/tests/unit/ml2/test_rpcapi.py b/neutron/tests/unit/ml2/test_rpcapi.py index 0f4a858b7..a2d3bf0eb 100644 --- a/neutron/tests/unit/ml2/test_rpcapi.py +++ b/neutron/tests/unit/ml2/test_rpcapi.py @@ -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) diff --git a/neutron/tests/unit/test_l3_plugin.py b/neutron/tests/unit/test_l3_plugin.py index e4d28513c..c138a7875 100644 --- a/neutron/tests/unit/test_l3_plugin.py +++ b/neutron/tests/unit/test_l3_plugin.py @@ -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)