@samitouri / QOSamiQemu / commits / d71fa99ca8

tests/functional/aspeed: Fix remaining hostname-specific login prompts

Commit b04746bd0d7c unified boot completion detection on the generic 'login:' prompt but missed several SDK test files that still matched on hostname-prefixed patterns. Apply the same fix. Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/4059 Fixes: b04746bd0d7c ("tests/functional/aspeed: unify boot completion detection on 'login:' prompt") Reported-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Link: https://lore.kernel.org/qemu-devel/20260720162321.3497633-1-clg@redhat.com Signed-off-by: Cédric Le Goater <clg@redhat.com>

Cédric Le Goater committed Jul 20, 2026 at 18:23 UTC d71fa99ca8769947ec4f59790fde4b0bf4a4e295
7 files changed +7 -7
tests/functional/aarch64/test_aspeed_ast2700a1.py
+1 -1
@@ -81,7 +81,7 @@ class AST2x00MachineSDK(QemuSystemTest):
81 def verify_openbmc_boot_and_login(self, name, enable_pcie=True):
82 self.verify_openbmc_boot_start(enable_pcie)
83
84 - wait_for_console_pattern(self, f'{name} login:')
84 + wait_for_console_pattern(self, 'login:')
85 exec_command_and_wait_for_pattern(self, 'root', 'Password:')
86 exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
87
tests/functional/aarch64/test_aspeed_ast2700a2.py
+1 -1
@@ -81,7 +81,7 @@ class AST2x00MachineSDK(QemuSystemTest):
81 def verify_openbmc_boot_and_login(self, name, enable_pcie=True):
82 self.verify_openbmc_boot_start(enable_pcie)
83
84 - wait_for_console_pattern(self, f'{name} login:')
84 + wait_for_console_pattern(self, 'login:')
85 exec_command_and_wait_for_pattern(self, 'root', 'Password:')
86 exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
87
tests/functional/aarch64/test_aspeed_ast2700fc.py
+1 -1
@@ -51,7 +51,7 @@ class AST2x00MachineSDK(QemuSystemTest):
51 self.enable_ast2700_pcie2()
52 wait_for_console_pattern(self, 'Starting kernel ...')
53
54 - wait_for_console_pattern(self, f'{name} login:')
54 + wait_for_console_pattern(self, 'login:')
55 exec_command_and_wait_for_pattern(self, 'root', 'Password:')
56 exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
57
tests/functional/arm/test_aspeed_ast2500_sdk.py
+1 -1
@@ -22,7 +22,7 @@ class AST2500Machine(AspeedTest):
22 self.do_test_arm_aspeed_sdk_start(
23 self.scratch_file("ast2500-default", "image-bmc"))
24
25 - self.wait_for_console_pattern('ast2500-default login:')
25 + self.wait_for_console_pattern('login:')
26
27
28 if __name__ == '__main__':
tests/functional/arm/test_aspeed_ast2500_sdk_515.py
+1 -1
@@ -22,7 +22,7 @@ class AST2500Machine(AspeedTest):
22 self.do_test_arm_aspeed_sdk_start(
23 self.scratch_file("ast2500-default-515", "image-bmc"))
24
25 - self.wait_for_console_pattern('ast2500-default-515 login:')
25 + self.wait_for_console_pattern('login:')
26
27
28 if __name__ == '__main__':
tests/functional/arm/test_aspeed_ast2600_sdk.py
+1 -1
@@ -63,7 +63,7 @@ class AST2600Machine(AspeedTest):
63 self.do_test_arm_aspeed_sdk_start(
64 self.scratch_file("ast2600-default-image", "image-bmc"))
65
66 - self.wait_for_console_pattern('ast2600-default login:')
66 + self.wait_for_console_pattern('login:')
67
68 exec_command_and_wait_for_pattern(self, 'root', 'Password:')
69 exec_command_and_wait_for_pattern(self, '0penBmc',
tests/functional/arm/test_aspeed_ast2600_sdk_515.py
+1 -1
@@ -22,7 +22,7 @@ class AST2600Machine(AspeedTest):
22 self.do_test_arm_aspeed_sdk_start(
23 self.scratch_file("ast2600-default-515-image", "image-bmc"))
24
25 - self.wait_for_console_pattern('ast2600-default-515 login:')
25 + self.wait_for_console_pattern('login:')
26
27
28 if __name__ == '__main__':