openstack
/
neutron
Code Issues Proposed changes

Merge "Remove function replacement with mock patch" into stable/icehouse

This commit is contained in:
Jenkins 2014-06-10 14:30:14 +00:00 committed by Gerrit Code Review
parent ab917e1e7e 5d9a034e4b
commit 0e0460c7d3
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/tests/unit/hyperv/test_hyperv_rpcapi.py
View File

@ -42,14 +42,11 @@ class rpcHyperVApiTestCase(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)
expected_args = [ctxt, topic, expected_msg]
for arg, expected_arg in zip(rpc_method_mock.call_args[0],
expected_args):