Re: [PATCH 1/2] tests/acceptance: Extract boot_integratorcp() from test_integratorcp()

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 2/1/20 8:06 AM, Thomas Huth wrote:
> On 31/01/2020 22.11, Philippe Mathieu-Daudé wrote:
>> 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.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>>   tests/acceptance/machine_arm_integratorcp.py | 16 ++++++++++------
>>   1 file changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/tests/acceptance/machine_arm_integratorcp.py b/tests/acceptance/machine_arm_integratorcp.py
>> index 4f9ab40f2f..748819916d 100644
>> --- a/tests/acceptance/machine_arm_integratorcp.py
>> +++ b/tests/acceptance/machine_arm_integratorcp.py
>> @@ -19,12 +19,7 @@ class IntegratorMachine(Test):
>>   
>>       timeout = 90
>>   
>> -    @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
>> -    def test_integratorcp(self):
>> -        """
>> -        :avocado: tags=arch:arm
>> -        :avocado: tags=machine:integratorcp
>> -        """
>> +    def boot_integratorcp(self):
>>           kernel_url = ('https://github.com/zayac/qemu-arm/raw/master/'
>>                         'arm-test/kernel/zImage.integrator')
>>           kernel_hash = '0d7adba893c503267c946a3cbdc63b4b54f25468'
>> @@ -40,4 +35,13 @@ class IntegratorMachine(Test):
>>                            '-initrd', initrd_path,
>>                            '-append', 'printk.time=0 console=ttyAMA0')
> 
> I wonder whether you might want to move the "console=ttyAMA0" to the
> test_integratorcp(), too, to get the text in the framebuffer in the
> second test instead?

This is not a test, but a common method used by both tests, so both use it.

> 
>>           self.vm.launch()
>> +
>> +    @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code')
>> +    def test_integratorcp(self):
>> +        """
>> +        :avocado: tags=arch:arm
>> +        :avocado: tags=machine:integratorcp
>> +        :avocado: tags=device:pl011
>> +        """
>> +        self.boot_integratorcp()
>>           wait_for_console_pattern(self, 'Log in as root')
>>
> 
> Anyway, patch looks fine,
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>

Thanks!

Peter, Thomas previous patch and these series are reviewed. Can you 
queue them in your target-arm.next tree?