summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2012-09-13 11:59:11 -0500
committerDolph Mathews <dolph.mathews@gmail.com>2012-09-13 12:01:45 -0500
commit4e1a0867f9e9f42dd7c2abe3a10ca8a8f7dddce3 (patch)
tree573ecd26423cb3d0daace368dd651284452e1a58 /tests
parent461fd623f649131a7c3b89abd76cdfa5596b522d (diff)
downloadkeystone-4e1a0867f9e9f42dd7c2abe3a10ca8a8f7dddce3.tar.gz
keystone-4e1a0867f9e9f42dd7c2abe3a10ca8a8f7dddce3.tar.xz
keystone-4e1a0867f9e9f42dd7c2abe3a10ca8a8f7dddce3.zip
Limit token revocation to tenant (bug 1050025)
Change-Id: I7ebe0192b4900ad9475119a6d582233b37b31fb4
Diffstat (limited to 'tests')
-rw-r--r--tests/test_backend.py22
1 files changed, 21 insertions, 1 deletions
diff --git a/tests/test_backend.py b/tests/test_backend.py
index 72ed5b57..424a4e0b 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -661,10 +661,12 @@ class TokenTests(object):
self.assertRaises(exception.TokenNotFound,
self.token_api.delete_token, token_id)
- def create_token_sample_data(self):
+ def create_token_sample_data(self, tenant_id=None):
token_id = uuid.uuid4().hex
data = {'id': token_id, 'a': 'b',
'user': {'id': 'testuserid'}}
+ if tenant_id is not None:
+ data['tenant'] = {'id': tenant_id, 'name': tenant_id}
self.token_api.create_token(token_id, data)
return token_id
@@ -689,6 +691,24 @@ class TokenTests(object):
self.assertNotIn(token_id2, tokens)
self.assertNotIn(token_id1, tokens)
+ # tenant-specific tokens
+ tenant1 = uuid.uuid4().hex
+ tenant2 = uuid.uuid4().hex
+ token_id3 = self.create_token_sample_data(tenant_id=tenant1)
+ token_id4 = self.create_token_sample_data(tenant_id=tenant2)
+ tokens = self.token_api.list_tokens('testuserid')
+ self.assertEquals(len(tokens), 2)
+ self.assertNotIn(token_id1, tokens)
+ self.assertNotIn(token_id2, tokens)
+ self.assertIn(token_id3, tokens)
+ self.assertIn(token_id4, tokens)
+ tokens = self.token_api.list_tokens('testuserid', tenant2)
+ self.assertEquals(len(tokens), 1)
+ self.assertNotIn(token_id1, tokens)
+ self.assertNotIn(token_id2, tokens)
+ self.assertNotIn(token_id3, tokens)
+ self.assertIn(token_id4, tokens)
+
def test_get_token_404(self):
self.assertRaises(exception.TokenNotFound,
self.token_api.get_token,