Updated Branches: refs/heads/4.2 85e32552a -> a250fca4b
Removing the vlan selection in network offering test Also do not wait for cleanup. Just send cleanup to server and proceed further. Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 04d9d209adae5bc2231c854f694238db8feb0057) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c625bb3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c625bb3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c625bb3 Branch: refs/heads/4.2 Commit: 0c625bb3f818feefd3c5dc58d1b98cddeeecc60e Parents: 85e3255 Author: Prasanna Santhanam <[email protected]> Authored: Wed Jul 3 17:03:39 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Fri Jul 19 13:52:09 2013 +0530 ---------------------------------------------------------------------- .../component/test_network_offering.py | 29 -------------------- test/integration/component/test_stopped_vm.py | 7 ----- 2 files changed, 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c625bb3/test/integration/component/test_network_offering.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py index a3e87f6..a6c9f97 100644 --- a/test/integration/component/test_network_offering.py +++ b/test/integration/component/test_network_offering.py @@ -92,7 +92,6 @@ class Services: "network": { "name": "Test Network", "displaytext": "Test Network", - "vlan": 2370, }, "lbrule": { "name": "SSH", @@ -199,13 +198,6 @@ class TestNOVirtualRouter(cloudstackTestCase): def tearDown(self): try: self.account.delete(self.apiclient) - interval = list_configurations( - self.apiclient, - name='account.cleanup.interval' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) * 2) - #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -778,13 +770,6 @@ class TestNOWithNetscaler(cloudstackTestCase): def tearDown(self): try: self.account.delete(self.apiclient) - interval = list_configurations( - self.apiclient, - name='account.cleanup.interval' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) * 2) - #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -1423,13 +1408,6 @@ class TestNetworkUpgrade(cloudstackTestCase): def tearDown(self): try: self.account.delete(self.apiclient) - interval = list_configurations( - self.apiclient, - name='account.cleanup.interval' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) * 2) - #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) @@ -1871,13 +1849,6 @@ class TestSharedNetworkWithoutIp(cloudstackTestCase): def tearDown(self): try: self.account.delete(self.apiclient) - interval = list_configurations( - self.apiclient, - name='account.cleanup.interval' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) * 2) - #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e) http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c625bb3/test/integration/component/test_stopped_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py index 0527b3d..b7742d3 100644 --- a/test/integration/component/test_stopped_vm.py +++ b/test/integration/component/test_stopped_vm.py @@ -1940,13 +1940,6 @@ class TestDeployOnSpecificHost(cloudstackTestCase): def tearDown(self): try: self.account.delete(self.apiclient) - interval = list_configurations( - self.apiclient, - name='account.cleanup.interval' - ) - # Sleep to ensure that all resources are deleted - time.sleep(int(interval[0].value) * 2) - #Clean up, terminate the created network offerings cleanup_resources(self.apiclient, self.cleanup) except Exception as e: raise Exception("Warning: Exception during cleanup : %s" % e)
