From: Michael Goldish <[email protected]> This is now taken care of by kvm_runtest_2.py.
Signed-off-by: Michael Goldish <[email protected]> diff --git a/client/tests/kvm_runtest_2/kvm_guest_wizard.py b/client/tests/kvm_runtest_2/kvm_guest_wizard.py index 2f08c78..afe6b02 100644 --- a/client/tests/kvm_runtest_2/kvm_guest_wizard.py +++ b/client/tests/kvm_runtest_2/kvm_guest_wizard.py @@ -139,24 +139,16 @@ def barrier_2(vm, words, fail_if_stuck_for, stuck_detection_history, output_dir, def run_steps(test, params, env): vm = kvm_utils.env_get_vm(env, params.get("main_vm")) if not vm: - message = "VM object not found in environment" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM object not found in environment" if not vm.is_alive(): - message = "VM seems to be dead; Guestwizard requires a living VM" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM seems to be dead; Guestwizard requires a living VM" steps_filename = params.get("steps") if not steps_filename: - message = "Steps filename not specified" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "Steps filename not specified" steps_filename = os.path.join(test.bindir, "steps", steps_filename) if not os.path.exists(steps_filename): - message = "Steps file not found: %s" % steps_filename - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "Steps file not found: %s" % steps_filename fail_if_stuck_for = params.get("fail_if_stuck_for") if fail_if_stuck_for: diff --git a/client/tests/kvm_runtest_2/stepmaker.py b/client/tests/kvm_runtest_2/stepmaker.py index 476c145..54a1a4a 100644 --- a/client/tests/kvm_runtest_2/stepmaker.py +++ b/client/tests/kvm_runtest_2/stepmaker.py @@ -323,24 +323,16 @@ class StepMaker(stepeditor.StepMakerWindow): def run_stepmaker(test, params, env): vm = kvm_utils.env_get_vm(env, params.get("main_vm")) if not vm: - message = "VM object not found in environment" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM object not found in environment" if not vm.is_alive(): - message = "VM seems to be dead; Step Maker requires a living VM" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "VM seems to be dead; Step Maker requires a living VM" steps_filename = params.get("steps") if not steps_filename: - message = "Steps filename not specified" - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "Steps filename not specified" steps_filename = os.path.join(test.bindir, "steps", steps_filename) if os.path.exists(steps_filename): - message = "Steps file %s already exists" % steps_filename - kvm_log.error(message) - raise error.TestError, message + raise error.TestError, "Steps file %s already exists" % steps_filename StepMaker(vm, steps_filename, test.debugdir, params) gtk.main() -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
