tests/functional/aspeed: Fix remaining hostname-specific login prompts
PATCH 1/1 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
--- 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(-)
tests/functional/aarch64/test_aspeed_ast2700a1.py +1 -1
@@ -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}:~#')
tests/functional/aarch64/test_aspeed_ast2700a2.py +1 -1
@@ -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}:~#')
tests/functional/aarch64/test_aspeed_ast2700fc.py +1 -1
@@ -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}:~#')
tests/functional/arm/test_aspeed_ast2500_sdk.py +1 -1
@@ -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__':
tests/functional/arm/test_aspeed_ast2500_sdk_515.py +1 -1
@@ -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__':
tests/functional/arm/test_aspeed_ast2600_sdk.py +1 -1
@@ -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',
tests/functional/arm/test_aspeed_ast2600_sdk_515.py +1 -1
@@ -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__':
Signature · 1 line
2.55.0
Quoted 10 lines · Cédric Le Goater
Commit
b04746bd0d7cunified 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]>---
thanks
-- PMM
Quoted 8 lines · Cédric Le Goater
Commit
b04746bd0d7cunified 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]>
Quoted 9 lines
--- 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(-)
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com ~~ https://hachyderm.io/@berrange :| |: https://libvirt.org ~~ https://entangle-photo.org :| |: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|
Quoted 8 lines · Cédric Le Goater
Commit
b04746bd0d7cunified 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]>
Quoted 9 lines
--- 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(-)