This commit(a20956ef6315480089ee7a6877071339d634109a) make login timeout can be configuration. This patch just rename reboot_timeout/boot_timeout to login_timeout.
Signed-off-by: Amos Kong <[email protected]> --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/client/tests/kvm/tests/boot.py b/client/tests/kvm/tests/boot.py index 9b3f392..8cc0218 100644 --- a/client/tests/kvm/tests/boot.py +++ b/client/tests/kvm/tests/boot.py @@ -16,9 +16,8 @@ def run_boot(test, params, env): @param env: Dictionary with test environment. """ vm = kvm_test_utils.get_living_vm(env, params.get("main_vm")) - session = kvm_test_utils.wait_for_login(vm, 0, - float(params.get("boot_timeout", 240)), - 0, 2) + timeout = float(params.get("login_timeout", 240)) + session = kvm_test_utils.wait_for_login(vm, 0, timeout, 0, 2) try: if not params.get("reboot_method"): @@ -28,7 +27,7 @@ def run_boot(test, params, env): session = kvm_test_utils.reboot(vm, session, params.get("reboot_method"), float(params.get("sleep_before_reset", 10)), - 0, float(params.get("reboot_timeout", 240))) + 0, timeout) finally: session.close() diff --git a/client/tests/kvm/tests/iofuzz.py b/client/tests/kvm/tests/iofuzz.py index 5bd1b8e..45a0eb9 100644 --- a/client/tests/kvm/tests/iofuzz.py +++ b/client/tests/kvm/tests/iofuzz.py @@ -91,9 +91,9 @@ def run_iofuzz(test, params, env): (op, operand)) - boot_timeout = float(params.get("boot_timeout", 240)) + login_timeout = float(params.get("login_timeout", 240)) vm = kvm_test_utils.get_living_vm(env, params.get("main_vm")) - session = kvm_test_utils.wait_for_login(vm, 0, boot_timeout, 0, 2) + session = kvm_test_utils.wait_for_login(vm, 0, login_timeout, 0, 2) try: ports = {} diff --git a/client/tests/kvm/tests/stress_boot.py b/client/tests/kvm/tests/stress_boot.py index 24a005c..0d3ed07 100644 --- a/client/tests/kvm/tests/stress_boot.py +++ b/client/tests/kvm/tests/stress_boot.py @@ -21,8 +21,8 @@ def run_stress_boot(tests, params, env): logging.info("Waiting for first guest to be up...") - boot_timeout = float(params.get("boot_timeout", 240)) - session = kvm_utils.wait_for(vm.remote_login, boot_timeout, 0, 2) + login_timeout = float(params.get("login_timeout", 240)) + session = kvm_utils.wait_for(vm.remote_login, login_timeout, 0, 2) if not session: raise error.TestFail("Could not log into first guest") @@ -44,7 +44,7 @@ def run_stress_boot(tests, params, env): params['vms'] += " " + vm_name curr_vm_session = kvm_utils.wait_for(curr_vm.remote_login, - boot_timeout, 0, 2) + login_timeout, 0, 2) if not curr_vm_session: raise error.TestFail("Could not log into guest #%d" % num) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index c678898..fd01311 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -119,13 +119,13 @@ variants: type = boot restart_vm = yes kill_vm_on_error = yes - boot_timeout = 240 + login_timeout = 240 - reboot: install setup unattended_install.cdrom type = boot reboot_method = shell kill_vm_on_error = yes - reboot_timeout = 240 + login_timeout = 240 - migrate: install setup unattended_install.cdrom type = migration @@ -240,7 +240,7 @@ variants: max_vms = 5 alive_test_cmd = uname -a clone_address_index_base = 10 - boot_timeout = 240 + login_timeout = 240 kill_vm = yes kill_vm_vm1 = no kill_vm_gracefully = no _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
