mirror of
https://github.com/qemu/qemu.git
synced 2025-08-11 06:18:15 +00:00
tests/acceptance: Extract boot_integratorcp() from test_integratorcp()
As we want to re-use this code, extract it as a new function. Since we are using the PL011 serial console, add a Avocado tag to ease filtering of tests. Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20200225172501.29609-4-philmd@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
5e0ac7e069
commit
595f1acaa4
@ -18,13 +18,7 @@ class IntegratorMachine(Test):
|
|||||||
|
|
||||||
timeout = 90
|
timeout = 90
|
||||||
|
|
||||||
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
|
def boot_integratorcp(self):
|
||||||
def test_integratorcp_console(self):
|
|
||||||
"""
|
|
||||||
Boots the Linux kernel and checks that the console is operational
|
|
||||||
:avocado: tags=arch:arm
|
|
||||||
:avocado: tags=machine:integratorcp
|
|
||||||
"""
|
|
||||||
kernel_url = ('https://github.com/zayac/qemu-arm/raw/master/'
|
kernel_url = ('https://github.com/zayac/qemu-arm/raw/master/'
|
||||||
'arm-test/kernel/zImage.integrator')
|
'arm-test/kernel/zImage.integrator')
|
||||||
kernel_hash = '0d7adba893c503267c946a3cbdc63b4b54f25468'
|
kernel_hash = '0d7adba893c503267c946a3cbdc63b4b54f25468'
|
||||||
@ -40,4 +34,14 @@ def test_integratorcp_console(self):
|
|||||||
'-initrd', initrd_path,
|
'-initrd', initrd_path,
|
||||||
'-append', 'printk.time=0 console=ttyAMA0')
|
'-append', 'printk.time=0 console=ttyAMA0')
|
||||||
self.vm.launch()
|
self.vm.launch()
|
||||||
|
|
||||||
|
@skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
|
||||||
|
def test_integratorcp_console(self):
|
||||||
|
"""
|
||||||
|
Boots the Linux kernel and checks that the console is operational
|
||||||
|
:avocado: tags=arch:arm
|
||||||
|
:avocado: tags=machine:integratorcp
|
||||||
|
:avocado: tags=device:pl011
|
||||||
|
"""
|
||||||
|
self.boot_integratorcp()
|
||||||
wait_for_console_pattern(self, 'Log in as root')
|
wait_for_console_pattern(self, 'Log in as root')
|
||||||
|
Loading…
Reference in New Issue
Block a user