You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/11/25 13:46:53 UTC
git commit: updated refs/heads/4.5 to 2805f51
Repository: cloudstack
Updated Branches:
refs/heads/4.5 3fe1f732d -> 2805f51e4
CLOUDSTACK-7965: Fix script related to force delete domain test case
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2805f51e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2805f51e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2805f51e
Branch: refs/heads/4.5
Commit: 2805f51e433d4005469c656ed03854a83028637b
Parents: 3fe1f73
Author: Ashutosh K <as...@clogeny.com>
Authored: Mon Nov 24 16:16:55 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Tue Nov 25 18:16:31 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_persistent_networks.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2805f51e/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index 8bebd8d..d34e6f4 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -2784,15 +2784,15 @@ class TestVPCNetworkOperations(cloudstackTestCase):
"vlan must not be null for persistent network: %s" %
persistent_network_2.id)
- # Force delete domain
- child_domain.delete(self.apiclient, cleanup=True)
-
except Exception as e:
self.cleanup.append(account_1)
self.cleanup.append(account_2)
self.cleanup.append(child_domain)
self.fail(e)
+ # Force delete domain
+ child_domain.delete(self.apiclient, cleanup=True)
+
self.debug("Waiting for account.cleanup.interval" +
" to cleanup any remaining resouces")
# Sleep 3*account.gc to ensure that all resources are deleted