Merge "Fix a copy/pasted test mistake"

This commit is contained in:
Jenkins 2014-11-20 08:53:53 +00:00 committed by Gerrit Code Review
commit 1ac81ab6ff
3 changed files with 3 additions and 3 deletions

View File

@ -34,7 +34,7 @@ class rpcHyperVApiTestCase(base.BaseTestCase):
def _test_hyperv_neutron_api(
self, rpcapi, topic, method, rpc_method, **kwargs):
ctxt = context.RequestContext('fake_user', 'fake_project')
expected_retval = 'foo' if method == 'call' else None
expected_retval = 'foo' if rpc_method == 'call' else None
expected_version = kwargs.pop('version', None)
expected_msg = rpcapi.make_msg(method, **kwargs)

View File

@ -167,7 +167,7 @@ class RpcApiTestCase(base.BaseTestCase):
def _test_rpc_api(self, rpcapi, topic, method, rpc_method, **kwargs):
ctxt = context.RequestContext('fake_user', 'fake_project')
expected_retval = 'foo' if method == 'call' else None
expected_retval = 'foo' if rpc_method == 'call' else None
expected_version = kwargs.pop('version', None)
expected_msg = rpcapi.make_msg(method, **kwargs)

View File

@ -32,7 +32,7 @@ class rpcApiTestCase(base.BaseTestCase):
def _test_mlnx_api(self, rpcapi, topic, method, rpc_method,
expected_msg=None, **kwargs):
ctxt = context.RequestContext('fake_user', 'fake_project')
expected_retval = 'foo' if method == 'call' else None
expected_retval = 'foo' if rpc_method == 'call' else None
expected_kwargs = {}
if topic:
expected_kwargs['topic'] = topic