From 22ab3782fa88ef97a154660af00e57ed8d831225 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Wed, 10 Feb 2016 10:44:59 +0300 Subject: [PATCH] fix cleanup in functional tests if resource was deleted it should be removed from cleanup list or error should be skipped. Change-Id: I5b33dacdfcd409012fe15910435b0d8963c43bae --- api/test_instance_attributes.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/test_instance_attributes.py b/api/test_instance_attributes.py index 64cc38f..c9e1adf 100644 --- a/api/test_instance_attributes.py +++ b/api/test_instance_attributes.py @@ -81,9 +81,10 @@ class InstanceAttributeTest(base.EC2TestCase): @testtools.skipUnless(CONF.aws.image_id, "image id is not defined") def test_disable_api_termination_attribute(self): instance_id = self.run_instance(DisableApiTermination=True) - self.addResourceCleanUp(self.client.modify_instance_attribute, - InstanceId=instance_id, - DisableApiTermination={'Value': False}) + res_clean = self.addResourceCleanUp( + self.client.modify_instance_attribute, + InstanceId=instance_id, + DisableApiTermination={'Value': False}) data = self.client.describe_instance_attribute( InstanceId=instance_id, Attribute='disableApiTermination') @@ -114,6 +115,7 @@ class InstanceAttributeTest(base.EC2TestCase): self.assertFalse(data['DisableApiTermination']['Value']) self.client.terminate_instances(InstanceIds=[instance_id]) + self.cancelResourceCleanUp(res_clean) self.get_instance_waiter().wait_delete(instance_id) @testtools.skipUnless(CONF.aws.image_id, "image id is not defined")