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/06/21 08:47:07 UTC
git commit: updated refs/heads/master to 4c51c60
Updated Branches:
refs/heads/master a7ef5c343 -> 4c51c60ef
CLOUDSTACK-3021: Order removal of resources
Sub domain removed before parent domain. Also fixed indentation issue in
cleanup list of class TestServiceOfferingHierarchy
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c51c60e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c51c60e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c51c60e
Branch: refs/heads/master
Commit: 4c51c60ef7517a7719764da94d81cd082caafdf9
Parents: a7ef5c3
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Jun 20 02:51:17 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Jun 21 12:16:30 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4c51c60e/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 39ff3ea..ee38c6d 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -753,12 +753,12 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
domainid=cls.domain_2.id
)
- cls._cleanup = [
- cls.account_2,
- cls.domain_2,
- cls.service_offering,
- cls.account_1,
- cls.domain_1,
+ cls._cleanup = [
+ cls.account_2,
+ cls.domain_2,
+ cls.service_offering,
+ cls.account_1,
+ cls.domain_1,
]
return
@@ -888,11 +888,11 @@ class TesttemplateHierarchy(cloudstackTestCase):
domainid=cls.domain_1.id
)
cls._cleanup = [
- cls.template,
- cls.account_1,
cls.account_2,
- cls.domain_1,
cls.domain_2,
+ cls.template,
+ cls.account_1,
+ cls.domain_1,
]
return