From f5ba9137cc70ead8b6959c28020087f302d2e1ce Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 25 Feb 2013 10:59:02 +0530 Subject: [PATCH] Back to the old expunge logic The expunge interval and delay are respected and no additional delays are introduced. Signed-off-by: Prasanna Santhanam --- test/integration/smoke/test_vm_life_cycle.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 3596ca244ba..8d65c00c896 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -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(