diff --git a/qemu/tests/cfg/system_reset_bootable.cfg b/qemu/tests/cfg/system_reset_bootable.cfg index 9d6966713df5997d2930c531b5326741a9fe4a42..8cef2f8da11ec11af7428edba63cb1d90fe8613b 100644 --- a/qemu/tests/cfg/system_reset_bootable.cfg +++ b/qemu/tests/cfg/system_reset_bootable.cfg @@ -4,3 +4,4 @@ reset_times = 20 wait_time_for_reset = 120 kill_vm_on_error = yes + start_vm = no diff --git a/qemu/tests/cfg/system_reset_during_boot.cfg b/qemu/tests/cfg/system_reset_during_boot.cfg index df0d8dce565c47a843ebba8122ed534adeecc2a9..55551f1227957374a87e1eae1247f5e5e1394657 100644 --- a/qemu/tests/cfg/system_reset_during_boot.cfg +++ b/qemu/tests/cfg/system_reset_during_boot.cfg @@ -6,3 +6,4 @@ reset_during_boot = yes fixed_interval = no image_verify_bootable = no + start_vm = no diff --git a/qemu/tests/system_reset_bootable.py b/qemu/tests/system_reset_bootable.py index 077ed6f9089ad6201fc35319a9f4a581b1eb6efb..b47bd2bc04eb0ac813d29c3b6c321dbe7ffa446a 100644 --- a/qemu/tests/system_reset_bootable.py +++ b/qemu/tests/system_reset_bootable.py @@ -18,21 +18,23 @@ def run_system_reset_bootable(test, params, env): @param env: Dictionary with test environment. """ vm = env.get_vm(params["main_vm"]) - vm.verify_alive() timeout = float(params.get("login_timeout", 240)) - reset_times = int(params.get("reset_times",20)) - interval = int(params.get("reset_interval",10)) - wait_time = int(params.get("wait_time_for_reset",60)) + reset_times = int(params.get("reset_times", 20)) + interval = int(params.get("reset_interval", 10)) + wait_time = int(params.get("wait_time_for_reset", 60)) if params.get("get_boot_time") == "yes": error.context("Check guest boot up time", logging.info) + vm.create() vm.wait_for_login(timeout=timeout) bootup_time = time.time() - vm.start_time if params.get("reset_during_boot") == "yes": interval = int(bootup_time) wait_time = random.randint(0, int(bootup_time)) vm.destroy() - vm.create() + + error.context("Boot the guest", logging.info) + vm.create() logging.info("Wait for %d seconds before reset" % wait_time) time.sleep(wait_time)