Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
client/tests/kvm/kvm_preprocessing.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index e624a42..5bae2bd 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -116,9 +116,12 @@ def postprocess_vm(test, params, env, name):
vm.send_monitor_cmd("screendump %s" % scrdump_filename)
if params.get("kill_vm") == "yes":
- if not kvm_utils.wait_for(vm.is_dead,
- float(params.get("kill_vm_timeout", 0)), 0.0, 1.0,
- "Waiting for VM to kill itself..."):
+ kill_vm_timeout = float(params.get("kill_vm_timeout", 0))
+ if kill_vm_timeout:
+ logging.debug("'kill_vm' specified; waiting for VM to shut down "
+ "before killing it...")
+ kvm_utils.wait_for(vm.is_dead, kill_vm_timeout, 0, 1)
+ else:
logging.debug("'kill_vm' specified; killing VM...")
vm.destroy(gracefully = params.get("kill_vm_gracefully") == "yes")
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
