You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/02/02 00:27:32 UTC
[9/50] [abbrv] git commit: refs/heads/master - test_vm_life_cycle:
Fix expunging logic as in mgmt server
test_vm_life_cycle: Fix expunging logic as in mgmt server
Sets expunge interval to 600 if it's less than that
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bc40ed85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bc40ed85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bc40ed85
Branch: refs/heads/master
Commit: bc40ed85e5c97dddd86ce6421feb50c7c92a54c8
Parents: 767f54c
Author: Rohit Yadav <bh...@apache.org>
Authored: Fri Jan 25 17:42:04 2013 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Fri Jan 25 17:43:37 2013 -0800
----------------------------------------------------------------------
test/integration/smoke/test_vm_life_cycle.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bc40ed85/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 0bd4f95..0834f5d 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -864,6 +864,9 @@ class TestVMLifeCycle(cloudstackTestCase):
name='expunge.interval'
)
expunge_cycle = int(config[0].value)*2
+ if expunge_cycle < 600:
+ expunge_cycle = 600*2
+
while expunge_cycle > 0:
list_vm_response = list_virtual_machines(
self.apiclient,