openstack/nova
Code Issues Proposed changes

Merge "Remove the useless require_admin_context decorator"

Browse Source
This commit is contained in:
Jenkins 2015-08-22 18:43:47 +00:00 committed by Gerrit Code Review
commit fb43dbcb9e
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nova/db/sqlalchemy/api.py
View File

@ -199,20 +199,6 @@ def get_backend():
return sys.modules[__name__]
def require_admin_context(f):
"""Decorator to require admin request context.
The first argument to the wrapped function must be the context.
"""
@functools.wraps(f)
def wrapper(*args, **kwargs):
nova.context.require_admin_context(args[0])
return f(*args, **kwargs)
return wrapper
def require_context(f):
"""Decorator to require *any* user or admin context.

3
nova/tests/unit/db/test_db_api.py
View File

@ -176,9 +176,6 @@ class DecoratorTestCase(test.TestCase):
def test_require_context_decorator_wraps_functions_properly(self):
self._test_decorator_wraps_helper(sqlalchemy_api.require_context)
def test_require_admin_context_decorator_wraps_functions_properly(self):
self._test_decorator_wraps_helper(sqlalchemy_api.require_admin_context)
def test_require_deadlock_retry_wraps_functions_properly(self):
self._test_decorator_wraps_helper(
oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True))