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/08/14 16:35:29 UTC
git commit: updated refs/heads/master to 151fc3e
Updated Branches:
refs/heads/master 500545cb8 -> 151fc3e83
CLOUDSTACK-3688: Test cases test_accounts.TestDomainForceRemove.test_forceDeleteDomain, not found the domain to delete and failed.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/151fc3e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/151fc3e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/151fc3e8
Branch: refs/heads/master
Commit: 151fc3e8375ad5fea2f2e5d07445b5c40f02b59f
Parents: 500545c
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Aug 14 15:39:32 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Aug 14 20:04:55 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/151fc3e8/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(