From 60bc2cc28a6cfd0c1f1fe40669c026533d23048a Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 24 Jul 2013 16:53:55 -0700 Subject: [PATCH] Automation: Fix test_vpc_vms_deployment resource release The account may be failed to be deleted in the test case, so we still need to clean it up after. --- test/integration/component/test_vpc_vms_deployment.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py index bef5f4535fb..a697fc38b98 100644 --- a/test/integration/component/test_vpc_vms_deployment.py +++ b/test/integration/component/test_vpc_vms_deployment.py @@ -1746,9 +1746,6 @@ class TestVMDeployVPC(cloudstackTestCase): # expected # 2. All the resources associated with account should be deleted - # Remove account from cleanup list, we will delete it at end of test - self.cleanup = [] - self.debug("Creating a VPC offering..") vpc_off = VpcOffering.create( self.apiclient, @@ -2427,6 +2424,9 @@ class TestVMDeployVPC(cloudstackTestCase): self.account.name) wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]) + # Remove account from cleanup list, we've already deleted it + self.cleanup.remove(self.account) + self.debug("Check if the VPC network is created successfully?") vpc_networks = VPC.list( self.apiclient,