addCleanup should be immediately after the creating statement.

It's not safe to add addCleanup for a bundle of resources after
creating them all, instead, addCleanup should be immediately after
every resource creation.

Change-Id: Icca816298d1d7e8e4d064a1adc7006c5f160f95d
This commit is contained in:
zhufl 2018-11-14 15:44:18 +08:00
parent 26eda82c3b
commit f824fcf0d7
2 changed files with 6 additions and 9 deletions

View File

@ -89,14 +89,10 @@ class ServicesTestJSON(base.BaseIdentityV2AdminTest):
service = self.services_client.create_service(
name=name, type=s_type,
description=description)['OS-KSADM:service']
self.addCleanup(self.services_client.delete_service, service['id'])
services.append(service)
service_ids = [svc['id'] for svc in services]
def delete_services():
for service_id in service_ids:
self.services_client.delete_service(service_id)
self.addCleanup(delete_services)
# List and Verify Services
body = self.services_client.list_services()['OS-KSADM:services']
found = [serv for serv in body if serv['id'] in service_ids]

View File

@ -57,18 +57,19 @@ class EC2CredentialsTest(base.BaseIdentityV2Test):
self.creds.user_id,
tenant_id=self.creds.tenant_id)["credential"]
created_creds.append(creds1['access'])
self.addCleanup(
self.non_admin_users_client.delete_user_ec2_credential,
self.creds.user_id, creds1['access'])
# create second ec2 credentials
creds2 = self.non_admin_users_client.create_user_ec2_credential(
self.creds.user_id,
tenant_id=self.creds.tenant_id)["credential"]
created_creds.append(creds2['access'])
# add credentials to be cleaned up
self.addCleanup(
self.non_admin_users_client.delete_user_ec2_credential,
self.creds.user_id, creds1['access'])
self.addCleanup(
self.non_admin_users_client.delete_user_ec2_credential,
self.creds.user_id, creds2['access'])
# get the list of user ec2 credentials
resp = self.non_admin_users_client.list_user_ec2_credentials(
self.creds.user_id)["credentials"]