CLOUDSTACK-3724: optimizing cleanup Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74ac8575 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74ac8575 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74ac8575 Branch: refs/heads/4.2 Commit: 74ac8575b09427c7511272bdd6592df092b55112 Parents: 605a31e Author: Prasanna Santhanam <[email protected]> Authored: Wed Jul 24 14:10:36 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Jul 24 16:52:45 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_vpc_vms_deployment.py | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74ac8575/test/integration/component/test_vpc_vms_deployment.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py index 194b406..bef5f45 100644 --- a/test/integration/component/test_vpc_vms_deployment.py +++ b/test/integration/component/test_vpc_vms_deployment.py @@ -153,7 +153,6 @@ class Services: }, "ostype": 'CentOS 5.3 (64-bit)', # Cent OS 5.3 (64 bit) - "sleep": 60, "timeout": 10, "mode": 'advanced' } @@ -219,10 +218,6 @@ class TestVMDeployVPC(cloudstackTestCase): try: #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) - wait_for_cleanup(self.apiclient, [ - "network.gc.interval", - "network.gc.wait"]) - except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) return @@ -305,7 +300,6 @@ class TestVMDeployVPC(cloudstackTestCase): self.services["vpc_offering"] ) - self._cleanup.append(vpc_off) self.validate_vpc_offering(vpc_off) self.debug("Enabling the VPC offering created")
