Skip to content

Commit 67f3506

Browse files
committed
windows: Extend installation timeouts
The default timeouts turned out to be insufficient for driver installs in some cases. Signed-off-by: Tu Dinh <[email protected]>
1 parent e35217b commit 67f3506

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

tests/guest_tools/win/guest_tools.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def install_guest_tools(vm: VM, guest_tools_iso: Dict[str, Any], action: PowerAc
5757
install_cmd += WINDOWS_SHUTDOWN_COMMAND
5858
vm.start_background_powershell(install_cmd)
5959
if action != PowerAction.Nothing:
60-
wait_for(vm.is_halted, "Wait for VM halted")
60+
wait_for(vm.is_halted, "Wait for VM halted", timeout_secs=600)
6161
if action == PowerAction.Reboot:
6262
vm.start()
6363
wait_for_vm_running_and_ssh_up_without_tools(vm)
@@ -75,7 +75,7 @@ def uninstall_guest_tools(vm: VM, action: PowerAction):
7575
uninstall_cmd += WINDOWS_SHUTDOWN_COMMAND
7676
vm.start_background_powershell(uninstall_cmd)
7777
if action != PowerAction.Nothing:
78-
wait_for(vm.is_halted, "Wait for VM halted")
78+
wait_for(vm.is_halted, "Wait for VM halted", timeout_secs=600)
7979
if action == PowerAction.Reboot:
8080
vm.start()
8181
wait_for_vm_running_and_ssh_up_without_tools(vm)

tests/guest_tools/win/test_xenclean.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ def run_xenclean(vm: VM, guest_tools_iso: Dict[str, Any]):
2727
xenclean_cmd = f"Set-Location C:\\; {xenclean_path} -NoReboot -Confirm:$false; {WINDOWS_SHUTDOWN_COMMAND}"
2828
vm.start_background_powershell(xenclean_cmd)
2929

30-
wait_for(vm.is_halted, "Wait for VM halted")
30+
# XenClean sometimes takes a bit long due to all the calls to the uninstallers. We need an extended timeout.
31+
wait_for(vm.is_halted, "Wait for VM halted", timeout_secs=900)
3132
vm.eject_cd()
3233

3334
vm.start()

0 commit comments

Comments
 (0)