From eae874918d717ba06d0ab18ece6e4a7a2f28471b Mon Sep 17 00:00:00 2001 From: Sowmya Krishnan Date: Mon, 29 Jul 2013 09:26:09 +0530 Subject: [PATCH] CLOUDSTACK-3744 Fixed order of cleanup objects, removed offerings cleanup Signed-off-by: Prasanna Santhanam (cherry picked from commit 08c82883f6bcc18804c88633c9c85764c5d22417) --- test/integration/component/test_netscaler_nw_off.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py index 5fd21950fe7..84616e127e5 100644 --- a/test/integration/component/test_netscaler_nw_off.py +++ b/test/integration/component/test_netscaler_nw_off.py @@ -605,11 +605,10 @@ class TestNetScalerSharedMode(cloudstackTestCase): ) cls._cleanup = [ cls.service_offering, - cls.network_offering, cls.account_1, cls.account_2, cls.account_3, - cls.account_5 + cls.account_5, ] cls.cleanup_devices = [cls.netscaler_1] return @@ -1132,7 +1131,6 @@ class TestNwOffDedicatedNetscaler(cloudstackTestCase): ) cls._cleanup = [ cls.service_offering, - cls.network_offering, cls.netscaler, ] return @@ -1312,8 +1310,6 @@ class TestNwOffNetscaler(cloudstackTestCase): ) cls._cleanup = [ cls.service_offering, - cls.network_offering, - cls.network_offering_shared, cls.netscaler_1, cls.netscaler_2, ] @@ -1623,8 +1619,6 @@ class TestNwOffSToDUpgrade(cloudstackTestCase): ) cls._cleanup = [ cls.service_offering, - cls.network_offering_dedicated, - cls.network_offering_shared, cls.netscaler_1, cls.netscaler_2, ] @@ -2040,8 +2034,6 @@ class TestNwOffDToSUpgrade(cloudstackTestCase): ) cls._cleanup = [ cls.service_offering, - cls.network_offering_dedicated, - cls.network_offering_shared, cls.netscaler_1, cls.netscaler_2, ]