Updated Branches: refs/heads/4.3 c9108376b -> 71993c10d
CLOUDSTACK-5149: fixed cls._cleanup initialization issue Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71993c10 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71993c10 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71993c10 Branch: refs/heads/4.3 Commit: 71993c10dd87692d7d518bcbf7b0456335d408ce Parents: c910837 Author: SrikanteswaraRao Talluri <tall...@apache.org> Authored: Tue Nov 12 19:20:14 2013 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Tue Nov 12 19:25:14 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_assign_vm.py | 2 +- test/integration/component/test_netscaler_lb.py | 36 ++++++++------------ .../component/test_netscaler_lb_algo.py | 10 +++--- 3 files changed, 20 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71993c10/test/integration/component/test_assign_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_assign_vm.py b/test/integration/component/test_assign_vm.py index 55c174b..cbdce73 100644 --- a/test/integration/component/test_assign_vm.py +++ b/test/integration/component/test_assign_vm.py @@ -150,7 +150,7 @@ class TestVMOwnership(cloudstackTestCase): cls.service_offering = ServiceOffering.create(cls.api_client, cls.services["service_offering"]) # Cleanup - cls._cleanup = [cls.service_offering] + cls._cleanup.append(cls.service_offering) # Create domain, account, user, project and volumes. cls.domain_account_user1 = create_domain_account_user() cls.domain_account_user2 = create_domain_account_user() http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71993c10/test/integration/component/test_netscaler_lb.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py index 5a8d6a4..26df545 100644 --- a/test/integration/component/test_netscaler_lb.py +++ b/test/integration/component/test_netscaler_lb.py @@ -149,6 +149,7 @@ class TestLbSourceNat(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestLbSourceNat, cls @@ -164,9 +165,7 @@ class TestLbSourceNat(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -359,6 +358,7 @@ class TestLbOnIpWithPf(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestLbOnIpWithPf, cls @@ -374,9 +374,7 @@ class TestLbOnIpWithPf(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -573,6 +571,7 @@ class TestPfOnIpWithLb(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestPfOnIpWithLb, cls @@ -588,9 +587,7 @@ class TestPfOnIpWithLb(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -788,6 +785,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestLbOnNonSourceNat, cls @@ -803,9 +801,7 @@ class TestLbOnNonSourceNat(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -1006,6 +1002,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestAddMultipleVmsLb, cls @@ -1021,9 +1018,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -1286,6 +1281,7 @@ class TestMultipleLbRules(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestMultipleLbRules, cls @@ -1301,9 +1297,7 @@ class TestMultipleLbRules(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -1606,6 +1600,7 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestMultipleLbRulesSameIp, cls @@ -1619,11 +1614,10 @@ class TestMultipleLbRulesSameIp(cloudstackTestCase): cls.zone.id, cls.services["ostype"] ) + try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71993c10/test/integration/component/test_netscaler_lb_algo.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py index a5e1fe8..3c18fcd 100644 --- a/test/integration/component/test_netscaler_lb_algo.py +++ b/test/integration/component/test_netscaler_lb_algo.py @@ -116,6 +116,7 @@ class TestLbWithRoundRobin(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestLbWithRoundRobin, cls @@ -131,9 +132,7 @@ class TestLbWithRoundRobin(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"], @@ -330,6 +329,7 @@ class TestLbWithLeastConn(cloudstackTestCase): @classmethod def setUpClass(cls): + cls._cleanup = [] cls.api_client = super( TestLbWithLeastConn, cls @@ -345,9 +345,7 @@ class TestLbWithLeastConn(cloudstackTestCase): ) try: cls.netscaler = add_netscaler(cls.api_client, cls.zone.id, cls.services["netscaler"]) - cls._cleanup = [ - cls.netscaler - ] + cls._cleanup.append(cls.netscaler) cls.network_offering = NetworkOffering.create( cls.api_client, cls.services["network_offering"],
