From 1e99a466bc62fd744e24434903c2172fe667fae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Mon, 23 Jun 2025 15:39:35 +0200 Subject: [PATCH] Fix flaky timeout after boot slot switching test (#4113) Add timeout to expect call when waiting for the OS reboot after switching slots. While it never fails for me locally, it regularly breaks tests in GHA. (cherry picked from commit 98a7a55df61e715968ef9ae336c3d9a8262b5e89) --- tests/smoke_test/test_os_update.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/smoke_test/test_os_update.py b/tests/smoke_test/test_os_update.py index b3cc0cb81..170e7e089 100644 --- a/tests/smoke_test/test_os_update.py +++ b/tests/smoke_test/test_os_update.py @@ -3,7 +3,6 @@ import logging from time import sleep import pytest -from labgrid.driver import ExecutionError _LOGGER = logging.getLogger(__name__) @@ -86,7 +85,7 @@ def test_boot_other_slot(shell, shell_json, target): shell.run_check(f"ha os boot-slot other --no-progress || true") - shell.console.expect("Booting `Slot ") + shell.console.expect("Booting `Slot ", timeout=60) # reactivate ShellDriver to handle login again target.deactivate(shell)