openstack/python-keystoneclient
Code Issues Proposed changes

Refactor test_credentials

Browse Source 
Do not reuse client's domain, create a new one to be used only by the
test, which is destroyed later.

Change-Id: I4e3bb11a92535650317a30e6a1854bfd161ee93f
This commit is contained in:
Rodrigo Duarte Sousa
2016-11-30 22:50:14 -03:00
parent 5cd7f5c873
commit e23cfc410c
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
keystoneclient/tests/functional/v3/test_credentials.py
View File

@@ -20,6 +20,11 @@ from keystoneclient.tests.functional.v3 import client_fixtures as fixtures
class CredentialsTestCase(base.V3ClientTestCase): class CredentialsTestCase(base.V3ClientTestCase):
def setUp(self):
super(CredentialsTestCase, self).setUp()
self.test_domain = fixtures.Domain(self.client)
self.useFixture(self.test_domain)
def check_credential(self, credential, credential_ref=None): def check_credential(self, credential, credential_ref=None):
self.assertIsNotNone(credential.id) self.assertIsNotNone(credential.id)
self.assertIn('self', credential.links) self.assertIn('self', credential.links)
@@ -46,7 +51,7 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.assertIsNotNone(credential.project_id) self.assertIsNotNone(credential.project_id)
def test_create_credential_of_cert_type(self): def test_create_credential_of_cert_type(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
credential_ref = {'user': user.id, credential_ref = {'user': user.id,
@@ -58,7 +63,7 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.check_credential(credential, credential_ref) self.check_credential(credential, credential_ref)
def test_create_credential_of_ec2_type(self): def test_create_credential_of_ec2_type(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
# project is mandatory attribute if the credential type is ec2 # project is mandatory attribute if the credential type is ec2
@@ -70,7 +75,7 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.client.credentials.create, self.client.credentials.create,
**credential_ref) **credential_ref)
project = fixtures.Project(self.client, self.project_domain_id) project = fixtures.Project(self.client, self.test_domain.id)
self.useFixture(project) self.useFixture(project)
credential_ref = {'user': user.id, credential_ref = {'user': user.id,
@@ -84,7 +89,7 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.check_credential(credential, credential_ref) self.check_credential(credential, credential_ref)
def test_create_credential_of_totp_type(self): def test_create_credential_of_totp_type(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
credential_ref = {'user': user.id, credential_ref = {'user': user.id,
@@ -96,9 +101,9 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.check_credential(credential, credential_ref) self.check_credential(credential, credential_ref)
def test_get_credential(self): def test_get_credential(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
project = fixtures.Project(self.client, self.project_domain_id) project = fixtures.Project(self.client, self.test_domain.id)
self.useFixture(project) self.useFixture(project)
for credential_type in ['cert', 'ec2', 'totp']: for credential_type in ['cert', 'ec2', 'totp']:
@@ -111,14 +116,14 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.check_credential(credential_ret, credential.ref) self.check_credential(credential_ret, credential.ref)
def test_list_credentials(self): def test_list_credentials(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
cert_credential = fixtures.Credential(self.client, user=user.id, cert_credential = fixtures.Credential(self.client, user=user.id,
type='cert') type='cert')
self.useFixture(cert_credential) self.useFixture(cert_credential)
project = fixtures.Project(self.client, self.project_domain_id) project = fixtures.Project(self.client, self.test_domain.id)
self.useFixture(project) self.useFixture(project)
ec2_credential = fixtures.Credential(self.client, user=user.id, ec2_credential = fixtures.Credential(self.client, user=user.id,
type='ec2', project=project.id) type='ec2', project=project.id)
@@ -139,12 +144,12 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.assertIn(totp_credential.entity, credentials) self.assertIn(totp_credential.entity, credentials)
def test_update_credential(self): def test_update_credential(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
new_user = fixtures.User(self.client, self.project_domain_id) new_user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(new_user) self.useFixture(new_user)
new_project = fixtures.Project(self.client, self.project_domain_id) new_project = fixtures.Project(self.client, self.test_domain.id)
self.useFixture(new_project) self.useFixture(new_project)
credential = fixtures.Credential(self.client, user=user.id, credential = fixtures.Credential(self.client, user=user.id,
@@ -166,9 +171,9 @@ class CredentialsTestCase(base.V3ClientTestCase):
self.check_credential(credential_ret, credential.ref) self.check_credential(credential_ret, credential.ref)
def test_delete_credential(self): def test_delete_credential(self):
user = fixtures.User(self.client, self.project_domain_id) user = fixtures.User(self.client, self.test_domain.id)
self.useFixture(user) self.useFixture(user)
project = fixtures.Project(self.client, self.project_domain_id) project = fixtures.Project(self.client, self.test_domain.id)
self.useFixture(project) self.useFixture(project)
for credential_type in ['cert', 'ec2', 'totp']: for credential_type in ['cert', 'ec2', 'totp']: