From b6850c28dc664e88c0128ddbae7c3ee468290350 Mon Sep 17 00:00:00 2001 From: Rayees Namathponnan Date: Tue, 18 Jun 2013 02:43:52 -0400 Subject: [PATCH] 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 --- test/integration/component/test_accounts.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index ec135b1de4f..39ff3eaaf11 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