openstack
/
tempest
Code Issues Proposed changes

Check domain's enabled attribute strictly 

Current test_domains checks domain's enabled attribute after converting
it to string because maybe that is for XML format. However, now Tempest
doesn't test XML format and the response of "create domain" is checked
as True instead of converting it to string.
This patch removes these conversions for checking boolean attribute.

Change-Id: I958de1e13b0169b03b56e4db1872d5ccf4e8904e
This commit is contained in:
Ken'ichi Ohmichi 2015-04-17 02:31:12 +00:00
parent 941c56c543
commit 73cb70b050
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/api/identity/admin/v2/test_users.py
View File

@ -50,7 +50,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest):
self.alt_email, enabled=False)
self.data.users.append(user)
self.assertEqual(name, user['name'])
self.assertEqual('false', str(user['enabled']).lower())
self.assertEqual(False, user['enabled'])
self.assertEqual(self.alt_email, user['email'])
@test.idempotent_id('39d05857-e8a5-4ed4-ba83-0b52d3ab97ee')
@ -71,13 +71,13 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest):
enabled=False)
self.assertEqual(u_name2, update_user['name'])
self.assertEqual(u_email2, update_user['email'])
self.assertEqual('false', str(update_user['enabled']).lower())
self.assertEqual(False, update_user['enabled'])
# GET by id after updating
updated_user = self.client.get_user(user['id'])
# Assert response body of GET after updating
self.assertEqual(u_name2, updated_user['name'])
self.assertEqual(u_email2, updated_user['email'])
self.assertEqual('false', str(updated_user['enabled']).lower())
self.assertEqual(False, update_user['enabled'])
@test.idempotent_id('29ed26f4-a74e-4425-9a85-fdb49fa269d2')
def test_delete_user(self):

4
tempest/api/identity/admin/v3/test_domains.py
View File

@ -79,12 +79,12 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest):
self.assertIsNotNone(updated_domain['id'])
self.assertEqual(new_name, updated_domain['name'])
self.assertEqual(new_desc, updated_domain['description'])
self.assertEqual('true', str(updated_domain['enabled']).lower())
self.assertEqual(True, updated_domain['enabled'])
fetched_domain = self.client.get_domain(domain['id'])
self.assertEqual(new_name, fetched_domain['name'])
self.assertEqual(new_desc, fetched_domain['description'])
self.assertEqual('true', str(fetched_domain['enabled']).lower())
self.assertEqual(True, fetched_domain['enabled'])
@test.idempotent_id('036df86e-bb5d-42c0-a7c2-66b9db3a6046')
def test_create_domain_with_disabled_status(self):

2
tempest/api/identity/admin/v3/test_endpoints.py
View File

@ -126,4 +126,4 @@ class EndPointsTestJSON(base.BaseIdentityV3AdminTest):
self.assertEqual(interface2, endpoint['interface'])
self.assertEqual(url2, endpoint['url'])
self.assertEqual(region2, endpoint['region'])
self.assertEqual('false', str(endpoint['enabled']).lower())
self.assertEqual(False, endpoint['enabled'])

4
tempest/api/identity/admin/v3/test_users.py
View File

@ -53,7 +53,7 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest):
self.assertEqual(project['id'],
update_user['project_id'])
self.assertEqual(u_email2, update_user['email'])
self.assertEqual('false', str(update_user['enabled']).lower())
self.assertEqual(False, update_user['enabled'])
# GET by id after updation
new_user_get = self.client.get_user(user['id'])
# Assert response body of GET after updation
@ -62,7 +62,7 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest):
self.assertEqual(project['id'],
new_user_get['project_id'])
self.assertEqual(u_email2, new_user_get['email'])
self.assertEqual('false', str(new_user_get['enabled']).lower())
self.assertEqual(False, new_user_get['enabled'])
@test.idempotent_id('2d223a0e-e457-4a70-9fb1-febe027a0ff9')
def test_update_user_password(self):