apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Back to the old expunge logic

Browse Source 
The expunge interval and delay are respected and no additional delays
are introduced.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-02-25 10:59:02 +05:30
parent c1e47ad329
commit f5ba9137cc
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/smoke/test_vm_life_cycle.py
View File

@ -854,9 +854,6 @@ class TestVMLifeCycle(cloudstackTestCase):
)
expunge_delay = int(config[0].value)
if expunge_delay < 600:
expunge_delay = 600
# Wait for some time more than expunge.delay
time.sleep(expunge_delay * 2)
#VM should be destroyed unless expunge thread hasn't run
@ -866,9 +863,6 @@ class TestVMLifeCycle(cloudstackTestCase):
name='expunge.interval'
)
expunge_cycle = int(config[0].value)
if expunge_cycle < 600:
expunge_cycle = 600
wait_time = expunge_cycle * 2
while wait_time >= 0:
list_vm_response = list_virtual_machines(