Merge pull request #6076 from Yingshun/go_no_cdrom

guest_os_booting: Fix up login timeout issue
autotest · Dec 20, 2024 · 7c6ccb7 · 7c6ccb7
2 parents 1d5261e + 91c50aa
commit 7c6ccb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libvirt/tests/cfg/guest_os_booting/boot_order/boot_from_cdrom_device.cfg b/libvirt/tests/cfg/guest_os_booting/boot_order/boot_from_cdrom_device.cfg
@@ -6,11 +6,13 @@
     variants:
         - without_cdrom:
             only os_dev
+            aarch64:
+                bootable_patterns = ["Shell>"]
         - with_cdrom_with_no_src:
             cdrom1_attrs = {'target': {'dev': 'sda', 'bus': 'sata'}, **${cdrom_attrs}}
             aarch64:
                 cdrom1_attrs = {'target': {'dev': 'sda', 'bus': 'scsi'}, **${cdrom_attrs}}
-                bootable_patterns = ["Shell>"] 
+                bootable_patterns = ["Shell>"]
         - with_cdrom:
             check_bootable_iso = "yes"
             cdrom1_attrs = {'source': {'attrs': {'file': boot_img_path}}, 'target': {'dev': 'sda', 'bus': 'scsi'}, **${cdrom_attrs}}
@@ -24,7 +26,7 @@
                 check_bootable_iso = "yes"
                 bootable_patterns = ["begin the installation process|Install Red Hat Enterprise"]
             os_dev:
-               status_error = "yes"  
+               status_error = "yes"
     variants:
         - os_dev:
             os_attrs_boots = ['cdrom']

diff --git a/libvirt/tests/src/guest_os_booting/boot_order/boot_from_cdrom_device.py b/libvirt/tests/src/guest_os_booting/boot_order/boot_from_cdrom_device.py
@@ -102,7 +102,7 @@ def run(test, params, env):
         vm.start()
         if bootable_patterns:
             vm.serial_console.read_until_output_matches(
-                bootable_patterns, timeout=60, internal_timeout=0.5)
+                bootable_patterns, timeout=360, internal_timeout=0.5)
         else:
             try:
                 vm.wait_for_serial_login().close()