From 3fec71e7489e199bbd6c70a5bcb62a64a3e3e0ff Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Sun, 28 Jul 2013 11:24:25 +0530 Subject: [PATCH] Fix domain deletion in test_project_resources.py Signed-off-by: Prasanna Santhanam (cherry picked from commit a019f34572ef591b238adb256a0036565bb21579) --- test/integration/component/test_project_resources.py | 3 +-- test/integration/component/test_projects.py | 2 +- test/integration/smoke/test_loadbalance.py | 2 +- test/integration/smoke/test_vm_life_cycle.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index 01aa1338f27..924c9169d37 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -784,8 +784,7 @@ class TestSnapshots(cloudstackTestCase): cls._cleanup = [ cls.project, cls.service_offering, - cls.account, - cls.domain + cls.account ] return diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py index 510542a15b8..e4c2180dd42 100644 --- a/test/integration/component/test_projects.py +++ b/test/integration/component/test_projects.py @@ -1203,7 +1203,7 @@ class TestProjectResources(cloudstackTestCase): raise Exception("Warning: Exception during cleanup : %s" % e) return - @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator", "needle"]) + @attr(tags = ["advanced", "basic", "sg", "eip", "advancedns", "simulator"]) def test_07_project_resources_account_delete(self): """ Test Verify after an account is removed from the project, all its resources stay with the project. """ diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py index f5405da5e1f..3e48158442a 100644 --- a/test/integration/smoke/test_loadbalance.py +++ b/test/integration/smoke/test_loadbalance.py @@ -211,7 +211,7 @@ class TestLoadBalance(cloudstackTestCase): time.sleep(self.services["lb_switch_wait"]) return - @attr(tags = ["advanced", "advancedns", "smoke", "needle"]) + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_01_create_lb_rule_src_nat(self): """Test to create Load balancing rule with source NAT""" diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 8e5a8bbcdd7..e8a4be50e14 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -696,7 +696,7 @@ class TestVMLifeCycle(cloudstackTestCase): ) return - @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg", "needle"]) + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"]) def test_10_attachAndDetach_iso(self): """Test for attach and detach ISO to virtual machine"""