From: Russell Bryant Date: Mon, 17 Nov 2014 20:14:04 +0000 (+0000) Subject: Drop test code copied from nova X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=33feefb553a76d52624875c08fd12b3914f00727;p=openstack-build%2Fneutron-build.git Drop test code copied from nova Drop a couple of lines of test code that originated in nova and got copied into Neutron. These lines are meaningless in Neutron and can be removed. Change-Id: Ic7c174ba0671ddd4a9403b74fa42e7944fe74145 --- diff --git a/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py b/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py index 971efdea0..c9268484f 100644 --- a/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py +++ b/neutron/tests/unit/hyperv/test_hyperv_rpcapi.py @@ -37,8 +37,6 @@ class rpcHyperVApiTestCase(base.BaseTestCase): expected_retval = 'foo' if method == 'call' else None expected_version = kwargs.pop('version', None) expected_msg = rpcapi.make_msg(method, **kwargs) - if rpc_method == 'cast' and method == 'run_instance': - kwargs['call'] = False proxy = n_rpc.RpcProxy with mock.patch.object(proxy, rpc_method) as rpc_method_mock: diff --git a/neutron/tests/unit/ml2/test_rpcapi.py b/neutron/tests/unit/ml2/test_rpcapi.py index f955df151..d874d7cbd 100644 --- a/neutron/tests/unit/ml2/test_rpcapi.py +++ b/neutron/tests/unit/ml2/test_rpcapi.py @@ -170,8 +170,6 @@ class RpcApiTestCase(base.BaseTestCase): expected_retval = 'foo' if method == 'call' else None expected_version = kwargs.pop('version', None) expected_msg = rpcapi.make_msg(method, **kwargs) - if rpc_method == 'cast' and method == 'run_instance': - kwargs['call'] = False rpc = n_rpc.RpcProxy with mock.patch.object(rpc, rpc_method) as rpc_method_mock: diff --git a/neutron/tests/unit/mlnx/test_rpcapi.py b/neutron/tests/unit/mlnx/test_rpcapi.py index a31e9478d..96e76af1b 100644 --- a/neutron/tests/unit/mlnx/test_rpcapi.py +++ b/neutron/tests/unit/mlnx/test_rpcapi.py @@ -40,8 +40,6 @@ class rpcApiTestCase(base.BaseTestCase): expected_kwargs['version'] = kwargs.pop('version') if not expected_msg: expected_msg = rpcapi.make_msg(method, **kwargs) - if rpc_method == 'cast' and method == 'run_instance': - kwargs['call'] = False self.fake_args = None self.fake_kwargs = None