openstack
/
oslo.db
Code Issues Proposed changes

Merge "Support context function argument as keyword"

This commit is contained in:
Zuul 2019-05-15 19:49:20 +00:00 committed by Gerrit Code Review
parent 925bb81c7f 7c164cf938
commit b9c51e295b
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oslo_db/sqlalchemy/enginefacade.py
View File

@ -1003,10 +1003,13 @@ class _TransactionContextManager(object):
context_index = 1
else:
context_index = 0
context_kw = argspec.args[context_index]
@functools.wraps(fn)
def wrapper(*args, **kwargs):
context = args[context_index]
context = kwargs.get(context_kw, None)
if not context:
context = args[context_index]
with self._transaction_scope(context):
return fn(*args, **kwargs)

13
oslo_db/tests/sqlalchemy/test_enginefacade.py
View File

@ -519,6 +519,19 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
with self._assert_reader_session(makers) as session:
session.execute("test")
def test_session_reader_decorator_kwarg_call(self):
context = oslo_context.RequestContext()
@enginefacade.reader
def go(context):
context.session.execute("test")
go(context=context)
with self._assert_engines() as engines:
with self._assert_makers(engines) as makers:
with self._assert_reader_session(makers) as session:
session.execute("test")
def test_connection_reader_decorator(self):
context = oslo_context.RequestContext()