openstack
/
keystone
Code Issues Proposed changes

fix style and termie's comments about comments

This commit is contained in:
Jesse Andrews 2012-01-26 15:04:54 -06:00
parent 726b5adab0
commit d6d56e45dc
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
tests/test_keystoneclient.py
View File

@ -372,17 +372,25 @@ class KcMasterTestCase(CompatTestCase):
def test_admin_requires_adminness(self): def test_admin_requires_adminness(self):
from keystoneclient import exceptions as client_exceptions from keystoneclient import exceptions as client_exceptions
# FIXME(termie): this should be Unauthorized # FIXME(ja): this should be Unauthorized
exception = client_exceptions.ClientException exception = client_exceptions.ClientException
two = self.get_client(self.user_two) # non-admin user two = self.get_client(self.user_two) # non-admin user
# USER CRUD # USER CRUD
self.assertRaises(exception, two.users.list) self.assertRaises(exception,
self.assertRaises(exception, two.users.get, self.user_two['id']) two.users.list)
self.assertRaises(exception, two.users.create, name='oops', self.assertRaises(exception,
password='password', email='oops@test.com') two.users.get,
self.assertRaises(exception, two.users.delete, self.user_foo['id']) user=self.user_two['id'])
self.assertRaises(exception,
two.users.create,
name='oops',
password='password',
email='oops@test.com')
self.assertRaises(exception,
two.users.delete,
user=self.user_foo['id'])
# TENANT CRUD # TENANT CRUD
# NOTE(ja): tenants.list is different since /tenants fulfills the # NOTE(ja): tenants.list is different since /tenants fulfills the
@ -393,17 +401,30 @@ class KcMasterTestCase(CompatTestCase):
tenants = two.tenants.list() tenants = two.tenants.list()
self.assertTrue(len(tenants) == 1) self.assertTrue(len(tenants) == 1)
self.assertTrue(tenants[0].id == self.tenant_baz['id']) self.assertTrue(tenants[0].id == self.tenant_baz['id'])
self.assertRaises(exception, two.tenants.get, self.tenant_bar['id']) self.assertRaises(exception,
self.assertRaises(exception, two.tenants.create, two.tenants.get,
tenant_name='oops', description="shouldn't work!", tenant_id=self.tenant_bar['id'])
self.assertRaises(exception,
two.tenants.create,
tenant_name='oops',
description="shouldn't work!",
enabled=True) enabled=True)
self.assertRaises(exception, two.tenants.delete, self.tenant_baz['id']) self.assertRaises(exception,
two.tenants.delete,
tenant=self.tenant_baz['id'])
# ROLE CRUD # ROLE CRUD
self.assertRaises(exception, two.roles.get, role='keystone_admin') self.assertRaises(exception,
self.assertRaises(exception, two.roles.list) two.roles.get,
self.assertRaises(exception, two.roles.create, name='oops') role='keystone_admin')
self.assertRaises(exception, two.roles.delete, 'keystone_admin') self.assertRaises(exception,
two.roles.list)
self.assertRaises(exception,
two.roles.create,
name='oops')
self.assertRaises(exception,
two.roles.delete,
role='keystone_admin')
# TODO(ja): MEMBERSHIP CRUD # TODO(ja): MEMBERSHIP CRUD
# TODO(ja): determine what else todo # TODO(ja): determine what else todo