Updated Branches: refs/heads/4.2 a04599b3c -> c5f1aea39
CLOUDSTACK-3688: Test cases test_accounts.TestDomainForceRemove.test_forceDeleteDomain, not found the domain to delete and failed. Signed-off-by: Prasanna Santhanam <t...@apache.org> (cherry picked from commit 151fc3e8375ad5fea2f2e5d07445b5c40f02b59f) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5f1aea3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5f1aea3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5f1aea3 Branch: refs/heads/4.2 Commit: c5f1aea39d6d0e7fbb1966d221627f7236bd6eb9 Parents: a04599b Author: Sanjay Tripathi <sanjay.tripa...@citrix.com> Authored: Wed Aug 14 15:39:32 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed Aug 14 20:05:02 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_accounts.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5f1aea3/test/integration/component/test_accounts.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index 06b78e6..fafcf9a 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -1510,13 +1510,17 @@ class TestDomainForceRemove(cloudstackTestCase): try: domain.delete(self.apiclient, cleanup=True) except Exception as e: - self.fail("Failed to delete domain: %s" % e) - - self.debug("Waiting for account.cleanup.interval" + - " to cleanup any remaining resouces") + self.debug("Waiting for account.cleanup.interval" + + " to cleanup any remaining resouces") + # Sleep 3*account.gc to ensure that all resources are deleted + wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]*3) + with self.assertRaises(cloudstackAPIException): + Domain.list( + self.apiclient, + id=domain.id, + listall=True + ) - # Sleep 2*account.gc to ensure that all resources are deleted - wait_for_cleanup(self.apiclient, ["account.cleanup.interval"]*2) self.debug("Checking if the resources in domain are deleted") with self.assertRaises(cloudstackAPIException): Account.list(
