Refactor: Remove use of self where not needed
In test_v3_resource, some tests create local entities scoped to the test class instance, as opposed to scoped only to the test method. This patch fixes such occurrences. Change-Id: Ie4f1e2e61d89fa10a99c9bebd2b9bd06fccd7c6a
This commit is contained in:
Samuel de Medeiros Queiroz
parent
7be3a51998
commit
e80aad0f20
|
|
@ -87,14 +87,14 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
def test_disable_domain(self):
|
||||
"""Call ``PATCH /domains/{domain_id}`` (set enabled=False)."""
|
||||
# Create a 2nd set of entities in a 2nd domain
|
||||
self.domain2 = unit.new_domain_ref()
|
||||
self.resource_api.create_domain(self.domain2['id'], self.domain2)
|
||||
domain2 = unit.new_domain_ref()
|
||||
self.resource_api.create_domain(domain2['id'], domain2)
|
||||
|
||||
project2 = unit.new_project_ref(domain_id=self.domain2['id'])
|
||||
project2 = unit.new_project_ref(domain_id=domain2['id'])
|
||||
self.resource_api.create_project(project2['id'], project2)
|
||||
|
||||
user2 = unit.create_user(self.identity_api,
|
||||
domain_id=self.domain2['id'],
|
||||
domain_id=domain2['id'],
|
||||
project_id=project2['id'])
|
||||
|
||||
self.assignment_api.add_user_to_project(project2['id'],
|
||||
|
|
@ -122,11 +122,11 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
self.v3_create_token(auth_data)
|
||||
|
||||
# Now disable the domain
|
||||
self.domain2['enabled'] = False
|
||||
domain2['enabled'] = False
|
||||
r = self.patch('/domains/%(domain_id)s' % {
|
||||
'domain_id': self.domain2['id']},
|
||||
'domain_id': domain2['id']},
|
||||
body={'domain': {'enabled': False}})
|
||||
self.assertValidDomainResponse(r, self.domain2)
|
||||
self.assertValidDomainResponse(r, domain2)
|
||||
|
||||
# Make sure the user can no longer authenticate, via
|
||||
# either API
|
||||
|
|
@ -153,7 +153,7 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
|
||||
auth_data = self.build_authentication_request(
|
||||
username=user2['name'],
|
||||
user_domain_id=self.domain2['id'],
|
||||
user_domain_id=domain2['id'],
|
||||
password=user2['password'],
|
||||
project_id=project2['id'])
|
||||
self.v3_create_token(auth_data,
|
||||
|
|
@ -195,39 +195,35 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
self.credential_api.create_credential(credential['id'], credential)
|
||||
|
||||
# Create a 2nd set of entities in a 2nd domain
|
||||
self.domain2 = unit.new_domain_ref()
|
||||
self.resource_api.create_domain(self.domain2['id'], self.domain2)
|
||||
domain2 = unit.new_domain_ref()
|
||||
self.resource_api.create_domain(domain2['id'], domain2)
|
||||
|
||||
project2 = unit.new_project_ref(domain_id=self.domain2['id'])
|
||||
project2 = unit.new_project_ref(domain_id=domain2['id'])
|
||||
self.resource_api.create_project(project2['id'], project2)
|
||||
|
||||
user2 = unit.new_user_ref(domain_id=self.domain2['id'],
|
||||
user2 = unit.new_user_ref(domain_id=domain2['id'],
|
||||
project_id=project2['id'])
|
||||
user2 = self.identity_api.create_user(user2)
|
||||
|
||||
group2 = unit.new_group_ref(domain_id=self.domain2['id'])
|
||||
group2 = unit.new_group_ref(domain_id=domain2['id'])
|
||||
group2 = self.identity_api.create_group(group2)
|
||||
|
||||
self.credential2 = self.new_credential_ref(
|
||||
user_id=user2['id'],
|
||||
project_id=project2['id'])
|
||||
self.credential_api.create_credential(
|
||||
self.credential2['id'],
|
||||
self.credential2)
|
||||
credential2 = self.new_credential_ref(user_id=user2['id'],
|
||||
project_id=project2['id'])
|
||||
self.credential_api.create_credential(credential2['id'], credential2)
|
||||
|
||||
# Now disable the new domain and delete it
|
||||
self.domain2['enabled'] = False
|
||||
domain2['enabled'] = False
|
||||
r = self.patch('/domains/%(domain_id)s' % {
|
||||
'domain_id': self.domain2['id']},
|
||||
'domain_id': domain2['id']},
|
||||
body={'domain': {'enabled': False}})
|
||||
self.assertValidDomainResponse(r, self.domain2)
|
||||
self.delete('/domains/%(domain_id)s' % {
|
||||
'domain_id': self.domain2['id']})
|
||||
self.assertValidDomainResponse(r, domain2)
|
||||
self.delete('/domains/%(domain_id)s' % {'domain_id': domain2['id']})
|
||||
|
||||
# Check all the domain2 relevant entities are gone
|
||||
self.assertRaises(exception.DomainNotFound,
|
||||
self.resource_api.get_domain,
|
||||
self.domain2['id'])
|
||||
domain2['id'])
|
||||
self.assertRaises(exception.ProjectNotFound,
|
||||
self.resource_api.get_project,
|
||||
project2['id'])
|
||||
|
|
@ -239,7 +235,7 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
user2['id'])
|
||||
self.assertRaises(exception.CredentialNotFound,
|
||||
self.credential_api.get_credential,
|
||||
self.credential2['id'])
|
||||
credential2['id'])
|
||||
|
||||
# ...and that all self.domain entities are still here
|
||||
r = self.resource_api.get_domain(self.domain['id'])
|
||||
|
|
@ -321,11 +317,11 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
becomes invalid once that domain is disabled.
|
||||
|
||||
"""
|
||||
self.domain = unit.new_domain_ref()
|
||||
self.resource_api.create_domain(self.domain['id'], self.domain)
|
||||
domain = unit.new_domain_ref()
|
||||
self.resource_api.create_domain(domain['id'], domain)
|
||||
|
||||
user2 = unit.create_user(self.identity_api,
|
||||
domain_id=self.domain['id'])
|
||||
domain_id=domain['id'])
|
||||
|
||||
# build a request body
|
||||
auth_body = self.build_authentication_request(
|
||||
|
|
@ -343,8 +339,8 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
expected_status=http_client.OK)
|
||||
|
||||
# now disable the domain
|
||||
self.domain['enabled'] = False
|
||||
url = "/domains/%(domain_id)s" % {'domain_id': self.domain['id']}
|
||||
domain['enabled'] = False
|
||||
url = "/domains/%(domain_id)s" % {'domain_id': domain['id']}
|
||||
self.patch(url,
|
||||
body={'domain': {'enabled': False}})
|
||||
|
||||
|
|
@ -1037,12 +1033,10 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
# Create a second credential with a different project
|
||||
project2 = unit.new_project_ref(domain_id=self.domain['id'])
|
||||
self.resource_api.create_project(project2['id'], project2)
|
||||
self.credential2 = self.new_credential_ref(
|
||||
credential2 = self.new_credential_ref(
|
||||
user_id=self.user['id'],
|
||||
project_id=project2['id'])
|
||||
self.credential_api.create_credential(
|
||||
self.credential2['id'],
|
||||
self.credential2)
|
||||
self.credential_api.create_credential(credential2['id'], credential2)
|
||||
|
||||
# Now delete the project
|
||||
self.delete(
|
||||
|
|
@ -1055,8 +1049,8 @@ class ResourceTestCase(test_v3.RestfulTestCase,
|
|||
self.credential_api.get_credential,
|
||||
credential_id=credential['id'])
|
||||
# But the credential for project2 is unaffected
|
||||
r = self.credential_api.get_credential(self.credential2['id'])
|
||||
self.assertDictEqual(self.credential2, r)
|
||||
r = self.credential_api.get_credential(credential2['id'])
|
||||
self.assertDictEqual(credential2, r)
|
||||
|
||||
def test_delete_not_leaf_project(self):
|
||||
"""Call ``DELETE /projects/{project_id}``."""
|
||||
|
|
|
|||
Loading…
Reference in New Issue