Back to the old expunge logic The expunge interval and delay are respected and no additional delays are introduced.
Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f5ba9137 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f5ba9137 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f5ba9137 Branch: refs/heads/qemu-img Commit: f5ba9137cc70ead8b6959c28020087f302d2e1ce Parents: c1e47ad Author: Prasanna Santhanam <[email protected]> Authored: Mon Feb 25 10:59:02 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Mon Feb 25 10:59:02 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_vm_life_cycle.py | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f5ba9137/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 3596ca2..8d65c00 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(
