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 <[email protected]> Signed-off-by: Cédric Le Goater <[email protected]> --- tests/functional/aarch64/test_aspeed_ast2700a1.py | 2 +- tests/functional/aarch64/test_aspeed_ast2700a2.py | 2 +- tests/functional/aarch64/test_aspeed_ast2700fc.py | 2 +- tests/functional/arm/test_aspeed_ast2500_sdk.py | 2 +- tests/functional/arm/test_aspeed_ast2500_sdk_515.py | 2 +- tests/functional/arm/test_aspeed_ast2600_sdk.py | 2 +- tests/functional/arm/test_aspeed_ast2600_sdk_515.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/functional/aarch64/test_aspeed_ast2700a1.py b/tests/functional/aarch64/test_aspeed_ast2700a1.py index 61d9ac5284a0..23f1b5de92c3 100755 --- a/tests/functional/aarch64/test_aspeed_ast2700a1.py +++ b/tests/functional/aarch64/test_aspeed_ast2700a1.py @@ -76,7 +76,7 @@ def verify_openbmc_boot_start(self, enable_pcie=True): def verify_openbmc_boot_and_login(self, name, enable_pcie=True): self.verify_openbmc_boot_start(enable_pcie) - wait_for_console_pattern(self, f'{name} login:') + wait_for_console_pattern(self, 'login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#') diff --git a/tests/functional/aarch64/test_aspeed_ast2700a2.py b/tests/functional/aarch64/test_aspeed_ast2700a2.py index 4c56cd1e68c9..17bf3093a5d0 100755 --- a/tests/functional/aarch64/test_aspeed_ast2700a2.py +++ b/tests/functional/aarch64/test_aspeed_ast2700a2.py @@ -76,7 +76,7 @@ def verify_openbmc_boot_start(self, enable_pcie=True): def verify_openbmc_boot_and_login(self, name, enable_pcie=True): self.verify_openbmc_boot_start(enable_pcie) - wait_for_console_pattern(self, f'{name} login:') + wait_for_console_pattern(self, 'login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#') diff --git a/tests/functional/aarch64/test_aspeed_ast2700fc.py b/tests/functional/aarch64/test_aspeed_ast2700fc.py index d28a850803a8..bd15c1d14c47 100755 --- a/tests/functional/aarch64/test_aspeed_ast2700fc.py +++ b/tests/functional/aarch64/test_aspeed_ast2700fc.py @@ -53,7 +53,7 @@ def verify_openbmc_boot_and_login(self, name): self.enable_ast2700_pcie2() wait_for_console_pattern(self, 'Starting kernel ...') - wait_for_console_pattern(self, f'{name} login:') + wait_for_console_pattern(self, 'login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#') diff --git a/tests/functional/arm/test_aspeed_ast2500_sdk.py b/tests/functional/arm/test_aspeed_ast2500_sdk.py index 5ab36b99ab47..6ab498b3ff54 100755 --- a/tests/functional/arm/test_aspeed_ast2500_sdk.py +++ b/tests/functional/arm/test_aspeed_ast2500_sdk.py @@ -22,7 +22,7 @@ def test_arm_ast2500_evb_sdk(self): self.do_test_arm_aspeed_sdk_start( self.scratch_file("ast2500-default", "image-bmc")) - self.wait_for_console_pattern('ast2500-default login:') + self.wait_for_console_pattern('login:') if __name__ == '__main__': diff --git a/tests/functional/arm/test_aspeed_ast2500_sdk_515.py b/tests/functional/arm/test_aspeed_ast2500_sdk_515.py index 2b257986f622..8d39dc65daaa 100755 --- a/tests/functional/arm/test_aspeed_ast2500_sdk_515.py +++ b/tests/functional/arm/test_aspeed_ast2500_sdk_515.py @@ -22,7 +22,7 @@ def test_arm_ast2500_evb_sdk_515(self): self.do_test_arm_aspeed_sdk_start( self.scratch_file("ast2500-default-515", "image-bmc")) - self.wait_for_console_pattern('ast2500-default-515 login:') + self.wait_for_console_pattern('login:') if __name__ == '__main__': diff --git a/tests/functional/arm/test_aspeed_ast2600_sdk.py b/tests/functional/arm/test_aspeed_ast2600_sdk.py index 01548dd1354d..cabbe230c4cc 100755 --- a/tests/functional/arm/test_aspeed_ast2600_sdk.py +++ b/tests/functional/arm/test_aspeed_ast2600_sdk.py @@ -63,7 +63,7 @@ def test_arm_ast2600_evb_sdk(self): self.do_test_arm_aspeed_sdk_start( self.scratch_file("ast2600-default-image", "image-bmc")) - self.wait_for_console_pattern('ast2600-default login:') + self.wait_for_console_pattern('login:') exec_command_and_wait_for_pattern(self, 'root', 'Password:') exec_command_and_wait_for_pattern(self, '0penBmc', diff --git a/tests/functional/arm/test_aspeed_ast2600_sdk_515.py b/tests/functional/arm/test_aspeed_ast2600_sdk_515.py index ec043e7d6116..a8e7faff4890 100755 --- a/tests/functional/arm/test_aspeed_ast2600_sdk_515.py +++ b/tests/functional/arm/test_aspeed_ast2600_sdk_515.py @@ -22,7 +22,7 @@ def test_arm_ast2600_evb_sdk_515(self): self.do_test_arm_aspeed_sdk_start( self.scratch_file("ast2600-default-515-image", "image-bmc")) - self.wait_for_console_pattern('ast2600-default-515 login:') + self.wait_for_console_pattern('login:') if __name__ == '__main__': -- 2.55.0
