summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2026-07-20 15:04:06 +0300
committerGitHub <noreply@github.com>2026-07-20 15:04:06 +0300
commit51ee73ec541b6e28ee430607ab93665ca8c13a93 (patch)
tree4b6f2bef96e14b0110f3a2cd37a41f7d92457a57 /scripts
parentc8a5554662ab94af27e0b9857299d7b21cb389dc (diff)
parent2d525e9a88fea6a384425f724e315578c754cd8f (diff)
downloadvyos-build-51ee73ec541b6e28ee430607ab93665ca8c13a93.tar.gz
vyos-build-51ee73ec541b6e28ee430607ab93665ca8c13a93.zip
Merge pull request #1247 from c-po/smoketest-fixes
T9099: improve test framework - add safeguards
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/check-qemu-install8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 0929ea02..684f135f 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -599,11 +599,19 @@ def BOOTLOADERchooseSerialConsole(child, live: bool) -> None:
time.sleep(BOOTLOADER_SLEEP)
child.send(KEY_RETURN)
time.sleep(BOOTLOADER_SLEEP)
+ # GRUB submenus never time out on their own, so confirm we actually
+ # landed on this submenu before navigating further - otherwise a
+ # dropped keypress leaves the VM stuck here until the login wait
+ # elsewhere expires
+ child.expect('Select console type', timeout=BOOTLOADER_TMO)
+
# Select console type
child.send(KEY_DOWN)
time.sleep(BOOTLOADER_SLEEP)
child.send(KEY_RETURN)
time.sleep(BOOTLOADER_SLEEP)
+ child.expect(r'ttyS \(serial\)', timeout=BOOTLOADER_TMO)
+
# *ttyS (serial)
child.send(KEY_DOWN)
time.sleep(BOOTLOADER_SLEEP)