cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/4.2 to 08c8288
Date Mon, 29 Jul 2013 10:05:53 GMT
Updated Branches:
  refs/heads/4.2 28a0b0c58 -> 08c82883f


CLOUDSTACK-3744 Fixed order of cleanup objects, removed offerings cleanup

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08c82883
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08c82883
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08c82883

Branch: refs/heads/4.2
Commit: 08c82883f6bcc18804c88633c9c85764c5d22417
Parents: 28a0b0c
Author: Sowmya Krishnan <sowmya.krishnan@citrix.com>
Authored: Mon Jul 29 09:26:09 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Jul 29 15:35:13 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_netscaler_nw_off.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08c82883/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index 5fd2195..84616e1 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,
                         ]


Mime
View raw message