jcs.org / qemu
qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio
fork atom

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>

authored by

Philippe Mathieu-Daudé and committed by
Peter Maydell 595f1aca 5e0ac7e0

+11 -7
+11 -7
tests/acceptance/machine_arm_integratorcp.py
··· 18 18 19 19 timeout = 90 20 20 21 - @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') 22 - def test_integratorcp_console(self): 23 - """ 24 - Boots the Linux kernel and checks that the console is operational 25 - :avocado: tags=arch:arm 26 - :avocado: tags=machine:integratorcp 27 - """ 21 + def boot_integratorcp(self): 28 22 kernel_url = ('https://github.com/zayac/qemu-arm/raw/master/' 29 23 'arm-test/kernel/zImage.integrator') 30 24 kernel_hash = '0d7adba893c503267c946a3cbdc63b4b54f25468' ··· 40 34 '-initrd', initrd_path, 41 35 '-append', 'printk.time=0 console=ttyAMA0') 42 36 self.vm.launch() 37 + 38 + @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code') 39 + def test_integratorcp_console(self): 40 + """ 41 + Boots the Linux kernel and checks that the console is operational 42 + :avocado: tags=arch:arm 43 + :avocado: tags=machine:integratorcp 44 + :avocado: tags=device:pl011 45 + """ 46 + self.boot_integratorcp() 43 47 wait_for_console_pattern(self, 'Log in as root')