You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/29 12:05:41 UTC
git commit: updated refs/heads/master to eae8749
Updated Branches:
refs/heads/master 20e64be8d -> eae874918
CLOUDSTACK-3744 Fixed order of cleanup objects, removed offerings cleanup
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 08c82883f6bcc18804c88633c9c85764c5d22417)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eae87491
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eae87491
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eae87491
Branch: refs/heads/master
Commit: eae874918d717ba06d0ab18ece6e4a7a2f28471b
Parents: 20e64be
Author: Sowmya Krishnan <so...@citrix.com>
Authored: Mon Jul 29 09:26:09 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Jul 29 15:35:29 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/eae87491/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,
]