From f824fcf0d7a15d55e12629a4ebdafb3e9694696f Mon Sep 17 00:00:00 2001 From: zhufl Date: Wed, 14 Nov 2018 15:44:18 +0800 Subject: [PATCH] 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 --- tempest/api/identity/admin/v2/test_services.py | 6 +----- tempest/api/identity/v2/test_ec2_credentials.py | 9 +++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tempest/api/identity/admin/v2/test_services.py b/tempest/api/identity/admin/v2/test_services.py index e2ed5ef0cc..03543ac727 100644 --- a/tempest/api/identity/admin/v2/test_services.py +++ b/tempest/api/identity/admin/v2/test_services.py @@ -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] diff --git a/tempest/api/identity/v2/test_ec2_credentials.py b/tempest/api/identity/v2/test_ec2_credentials.py index 237e728c53..9981ef8bea 100644 --- a/tempest/api/identity/v2/test_ec2_credentials.py +++ b/tempest/api/identity/v2/test_ec2_credentials.py @@ -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"]