Updated Branches: refs/heads/master-6-17-stable 5970b3927 -> 10d9e5965
do not wait for 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/10d9e596 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10d9e596 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10d9e596 Branch: refs/heads/master-6-17-stable Commit: 10d9e5965a687c0c2d1d6c3e57f38602420720d6 Parents: 5970b39 Author: Prasanna Santhanam <[email protected]> Authored: Sat Jul 6 20:17:51 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Sat Jul 6 20:17:51 2013 +0530 ---------------------------------------------------------------------- .../component/maint/test_vpc_host_maintenance.py | 4 ---- .../component/test_vpc_network_staticnatrule.py | 4 ++-- test/integration/component/test_vpc_routers.py | 14 -------------- 3 files changed, 2 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10d9e596/test/integration/component/maint/test_vpc_host_maintenance.py ---------------------------------------------------------------------- diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py index 8fc427a..0946ceb 100644 --- a/test/integration/component/maint/test_vpc_host_maintenance.py +++ b/test/integration/component/maint/test_vpc_host_maintenance.py @@ -332,10 +332,6 @@ class TestVMLifeCycleHostmaintenance(cloudstackTestCase): wait_for_cleanup(cls.api_client, ["account.cleanup.interval"]) #Cleanup resources used cleanup_resources(cls.api_client, cls._cleanup) - - # Waiting for network cleanup to delete vpc offering - wait_for_cleanup(cls.api_client, ["network.gc.wait", - "network.gc.interval"]) cls.vpc_off.delete(cls.api_client) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10d9e596/test/integration/component/test_vpc_network_staticnatrule.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_network_staticnatrule.py b/test/integration/component/test_vpc_network_staticnatrule.py index c064053..80e8477 100644 --- a/test/integration/component/test_vpc_network_staticnatrule.py +++ b/test/integration/component/test_vpc_network_staticnatrule.py @@ -332,9 +332,9 @@ class TestVPCNetworkPFRules(cloudstackTestCase): try: urllib.urlretrieve("http://%s/test.html"; % public_ip.ipaddress.ipaddress, filename="test.html") if not testnegative: - self.debug("Successesfull to wget from VM=%s http server on public_ip=%s" % (vm.name, public_ip.ipaddress.ipaddress)) + self.debug("Successful to wget from VM=%s http server on public_ip=%s" % (vm.name, public_ip.ipaddress.ipaddress)) else: - self.fail("Successesfull to wget from VM=%s http server on public_ip=%s" % (vm.name, public_ip.ipaddress.ipaddress)) + self.fail("Successful to wget from VM=%s http server on public_ip=%s" % (vm.name, public_ip.ipaddress.ipaddress)) except: if not testnegative: self.fail("Failed to wget from VM=%s http server on public_ip=%s" % (vm.name, public_ip.ipaddress.ipaddress)) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10d9e596/test/integration/component/test_vpc_routers.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py index 3501110..43116b0 100644 --- a/test/integration/component/test_vpc_routers.py +++ b/test/integration/component/test_vpc_routers.py @@ -227,8 +227,6 @@ class TestVPCRoutersBasic(cloudstackTestCase): cleanup_resources(cls.apiclient, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) - - wait_for_cleanup(cls.apiclient, ["account.cleanup.interval"]) return def setUp(self): @@ -820,8 +818,6 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): cleanup_resources(cls.apiclient, cls._cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) - - wait_for_cleanup(cls.apiclient, ["account.cleanup.interval"]) return def setUp(self): @@ -839,16 +835,6 @@ class TestVPCRouterOneNetwork(cloudstackTestCase): try: #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) - interval = list_configurations( - self.apiclient, - name='network.gc.interval' - ) - wait = list_configurations( - self.apiclient, - name='network.gc.wait' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) + int(wait[0].value)) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e)
