Merge pull request #1247 from c-po/smoketest-fixes

T9099: improve test framework - add safeguards

Author: sever-sever

Makefile

@@ -4,6 +4,15 @@ build_dir := build
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 ISO_PATH := $(build_dir)/live-image-$(ARCH).hybrid.iso
 
+# Test targets forward extra CLI arguments (e.g. `make test -- --match foo`)
+# to their scripts via $(MAKECMDGOALS). Those extra words are also goals as
+# far as make is concerned, so without this they'd fall through to the `%:`
+# flavor rule below and run build-vyos-image with garbage arguments.
+TEST_TARGETS := test test-no-interfaces test-no-interfaces-no-vpp test-interfaces test-vpp testc testcvpp testraid testsb testtpm test-ci-qcow2 test-image-update qemu-live
+ifneq ($(filter $(TEST_TARGETS),$(firstword $(MAKECMDGOALS))),)
+$(eval $(filter-out $(firstword $(MAKECMDGOALS)),$(MAKECMDGOALS)):;@:)
+endif
+
 .PHONY: all
 all:
 	@echo "Make what specifically?"

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)