openstack/cinder
Code Issues Proposed changes

Merge "context.elevated() should use copy.deepcopy()"

Browse Source
This commit is contained in:
Jenkins 2014-11-21 11:46:21 +00:00 committed by Gerrit Code Review
commit 3ec9917581
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/context.py
View File

@ -149,7 +149,7 @@ class RequestContext(object):
def elevated(self, read_deleted=None, overwrite=False): def elevated(self, read_deleted=None, overwrite=False):
"""Return a version of this context with admin flag set.""" """Return a version of this context with admin flag set."""
context = copy.copy(self) context = self.deepcopy()
context.is_admin = True context.is_admin = True
if 'admin' not in context.roles: if 'admin' not in context.roles:

10
cinder/tests/test_context.py
View File

@ -54,6 +54,16 @@ class ContextTestCase(test.TestCase):
'read_deleted', 'read_deleted',
True) True)
def test_request_context_elevated(self):
user_context = context.RequestContext(
'fake_user', 'fake_project', admin=False)
self.assertFalse(user_context.is_admin)
admin_context = user_context.elevated()
self.assertFalse(user_context.is_admin)
self.assertTrue(admin_context.is_admin)
self.assertFalse('admin' in user_context.roles)
self.assertTrue('admin' in admin_context.roles)
def test_service_catalog_nova_and_swift(self): def test_service_catalog_nova_and_swift(self):
service_catalog = [ service_catalog = [
{u'type': u'compute', u'name': u'nova'}, {u'type': u'compute', u'name': u'nova'},