* Made post-process use the vm instance LOGIN_WAIT_TIMEOUT attribute * Removed redefinition of inherited qemu_vm.VM attributes, update comment.
Signed-off-by: Chris Evich <[email protected]> --- virttest/env_process.py | 2 +- virttest/qemu_vm.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/virttest/env_process.py b/virttest/env_process.py index fed3682..e48287f 100644 --- a/virttest/env_process.py +++ b/virttest/env_process.py @@ -501,7 +501,7 @@ def postprocess(test, params, env): continue try: # Test may be fast, guest could still be booting - session = vm.wait_for_login(timeout=120) + session = vm.wait_for_login(timeout=vm.LOGIN_WAIT_TIMEOUT) session.close() except (remote.LoginError, virt_vm.VMError), e: logging.warn(e) diff --git a/virttest/qemu_vm.py b/virttest/qemu_vm.py index 3444394..52d7a19 100644 --- a/virttest/qemu_vm.py +++ b/virttest/qemu_vm.py @@ -36,15 +36,7 @@ class VM(virt_vm.BaseVM): MIGRATION_PROTOS = ['tcp', 'unix', 'exec', 'fd'] - # - # By default we inherit all timeouts from the base VM class - # - LOGIN_TIMEOUT = virt_vm.BaseVM.LOGIN_TIMEOUT - LOGIN_WAIT_TIMEOUT = virt_vm.BaseVM.LOGIN_WAIT_TIMEOUT - COPY_FILES_TIMEOUT = virt_vm.BaseVM.COPY_FILES_TIMEOUT - MIGRATE_TIMEOUT = virt_vm.BaseVM.MIGRATE_TIMEOUT - REBOOT_TIMEOUT = virt_vm.BaseVM.REBOOT_TIMEOUT - CREATE_TIMEOUT = virt_vm.BaseVM.CREATE_TIMEOUT + # By default we inherit all timeouts from the base VM class except... CLOSE_SESSION_TIMEOUT = 30 def __init__(self, name, params, root_dir, address_cache, state=None): -- 1.7.1 _______________________________________________ Virt-test-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/virt-test-devel
