Merge "Replace usage of 'user' by 'user_id'"

This commit is contained in:
Zuul 2018-04-11 11:04:37 +00:00 committed by Gerrit Code Review
commit d3db4250be

View File

@ -317,7 +317,7 @@ class RpcCallbacksTestCase(base.BaseTestCase):
class RpcApiTestCase(base.BaseTestCase): class RpcApiTestCase(base.BaseTestCase):
def _test_rpc_api(self, rpcapi, topic, method, rpc_method, **kwargs): def _test_rpc_api(self, rpcapi, topic, method, rpc_method, **kwargs):
ctxt = oslo_context.RequestContext(user='fake_user', ctxt = oslo_context.RequestContext(user_id='fake_user',
tenant='fake_project') tenant='fake_project')
expected_retval = 'foo' if rpc_method == 'call' else None expected_retval = 'foo' if rpc_method == 'call' else None
expected_version = kwargs.pop('version', None) expected_version = kwargs.pop('version', None)