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/28 21:22:36 UTC
[15/29] git commit: updated refs/heads/master-6-17-stable to 93712c2
CLOUDSTACK-3021: Correct the order of resources
Resources are ordered so that the cleanup succeeds.
domains are deleted after accounts under the domain are removed.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit b6850c28dc664e88c0128ddbae7c3ee468290350)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9eeacd11
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9eeacd11
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9eeacd11
Branch: refs/heads/master-6-17-stable
Commit: 9eeacd11215d6b3661941f7a54a334b510d37a7c
Parents: 8c28f00
Author: Rayees Namathponnan <ra...@citrix.com>
Authored: Tue Jun 18 02:43:52 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jun 29 00:52:07 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9eeacd11/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index ec135b1..39ff3ea 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -753,13 +753,14 @@ class TestServiceOfferingHierarchy(cloudstackTestCase):
domainid=cls.domain_2.id
)
- cls._cleanup = [
- cls.account_1,
- cls.account_2,
- cls.service_offering,
- cls.domain_1,
- cls.domain_2,
- ]
+ cls._cleanup = [
+ cls.account_2,
+ cls.domain_2,
+ cls.service_offering,
+ cls.account_1,
+ cls.domain_1,
+ ]
+
return
@classmethod