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 <t...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6850c28 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6850c28 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6850c28 Branch: refs/heads/object_store Commit: b6850c28dc664e88c0128ddbae7c3ee468290350 Parents: 168fb29 Author: Rayees Namathponnan <raye...@citrix.com> Authored: Tue Jun 18 02:43:52 2013 -0400 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed Jun 19 09:28:16 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/b6850c28/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
