diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-16 19:01:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-16 19:01:55 +0000 |
| commit | b01b89e3df1f286e4d1b56e672492163f7620a7b (patch) | |
| tree | 5055ab0d9dc8364d994d06931ef4976dccd223f7 /tests/test_backend.py | |
| parent | 2e15fe428a2393f786852eb28c26bb9fee166bda (diff) | |
| parent | 08aaeb081958b05124ee60a0a9d34797b1f2c364 (diff) | |
| download | keystone-b01b89e3df1f286e4d1b56e672492163f7620a7b.tar.gz keystone-b01b89e3df1f286e4d1b56e672492163f7620a7b.tar.xz keystone-b01b89e3df1f286e4d1b56e672492163f7620a7b.zip | |
Merge "Test listing of tokens with a null tenant"
Diffstat (limited to 'tests/test_backend.py')
| -rw-r--r-- | tests/test_backend.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/test_backend.py b/tests/test_backend.py index 03fbf00d..981639e4 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py @@ -28,6 +28,7 @@ from keystone import test CONF = config.CONF DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id TIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' +NULL_OBJECT = object() class IdentityTests(object): @@ -2011,6 +2012,8 @@ class TokenTests(object): 'user': {'id': 'testuserid'}} if tenant_id is not None: data['tenant'] = {'id': tenant_id, 'name': tenant_id} + if tenant_id is NULL_OBJECT: + data['tenant'] = None if trust_id is not None: data['trust_id'] = trust_id new_token = self.token_api.create_token(token_id, data) @@ -2042,12 +2045,15 @@ class TokenTests(object): tenant2 = uuid.uuid4().hex token_id3 = self.create_token_sample_data(tenant_id=tenant1) token_id4 = self.create_token_sample_data(tenant_id=tenant2) + # test for existing but empty tenant (LP:1078497) + token_id5 = self.create_token_sample_data(tenant_id=NULL_OBJECT) tokens = self.token_api.list_tokens('testuserid') - self.assertEquals(len(tokens), 2) + self.assertEquals(len(tokens), 3) self.assertNotIn(token_id1, tokens) self.assertNotIn(token_id2, tokens) self.assertIn(token_id3, tokens) self.assertIn(token_id4, tokens) + self.assertIn(token_id5, tokens) tokens = self.token_api.list_tokens('testuserid', tenant2) self.assertEquals(len(tokens), 1) self.assertNotIn(token_id1, tokens) |