cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [20/29] git commit: updated refs/heads/master-6-17-stable to 93712c2
Date Fri, 28 Jun 2013 19:22:41 GMT
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 <tsp@apache.org>
(cherry picked from commit 4c51c60ef7517a7719764da94d81cd082caafdf9)


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

Branch: refs/heads/master-6-17-stable
Commit: 07f28ae5dc0e9cb29dc856286096e5a0179bb698
Parents: 8312741
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu Jun 20 02:51:17 2013 -0400
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jun 29 00:52:08 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/07f28ae5/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
 


Mime
View raw message