Re: [PATCH v2 1/6] tests/boot_linux_console: add microvm acceptance test

[Liam Merwick]

On 06/02/2020 14:09, Philippe Mathieu-Daudé wrote:
> Hi Liam,
>
> On 2/6/20 2:57 PM, Philippe Mathieu-Daudé wrote:
> > On 2/5/20 3:56 PM, Liam Merwick wrote:
> > > Refactor test_x86_64_pc() to test_x86_64_machine() so that separate
> > > functions which specify the Avocado tag of ':avocado: tags=machine:'
> > > as being either 'pc' or 'microvm' can be used to test booting a
> > > compressed kernel using either machine class.
> > >
> > > Signed-off-by: Liam Merwick <address@hidden>
> > > Reviewed-by: Stefano Garzarella <address@hidden>
> > > ---
> > >   tests/acceptance/boot_linux_console.py | 20 +++++++++++++++++---
> > >   1 file changed, 17 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/tests/acceptance/boot_linux_console.py 
> > > b/tests/acceptance/boot_linux_console.py
> > > index e40b84651b0b..233601b429bd 100644
> > > --- a/tests/acceptance/boot_linux_console.py
> > > +++ b/tests/acceptance/boot_linux_console.py
> > > @@ -51,10 +51,10 @@ class BootLinuxConsole(Test):
> > >           os.chdir(cwd)
> > >           return self.workdir + path
> > > -    def test_x86_64_pc(self):
> > > +    def do_test_x86_64_machine(self):
> > >           """
> > > -        :avocado: tags=arch:x86_64
> > > -        :avocado: tags=machine:pc
> > > +        Common routine to boot an x86_64 guest.
> > > +        Caller must specify tags=arch and tags=machine
> > >           """
> > >           kernel_url = 
> > > ('https://archives.fedoraproject.org/pub/archive/fedora'
> > > '/linux/releases/29/Everything/x86_64/os/images/pxeboot'
> > > @@ -70,6 +70,20 @@ class BootLinuxConsole(Test):
> > >           console_pattern = 'Kernel command line: %s' % 
> > > kernel_command_line
> > >           self.wait_for_console_pattern(console_pattern)
> > > +    def test_x86_64_pc(self):
> > > +        """
> > > +        :avocado: tags=arch:x86_64
> > > +        :avocado: tags=machine:pc
> > > +        """
> > > +        self.do_test_x86_64_machine()
> > > +
> > > +    def test_x86_64_microvm(self):
> > > +        """
> > > +        :avocado: tags=arch:x86_64
> > > +        :avocado: tags=machine:microvm
> > > +        """
> > > +        self.do_test_x86_64_machine()
> > > +
> > >       def test_mips_malta(self):
> > >           """
> > >           :avocado: tags=arch:mips
> >
> > Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> > Tested-by: Philippe Mathieu-Daudé <address@hidden>
>
> Actually this breaks testing the distrib QEMU:


I happen to have a QEMU RPM installed - how do I override 'make 
check-acceptance' to pick up /usr/bin/qemu-system-x86_64 (and 
/usr/share/qemu/bios-microvm.bin - not sure that is a universal location 
for distros)?   Overriding QTEST_QEMU_BINARY didn't seem to work for me 
- doesn't appear to apply to the check-acceptance rule.

>   (1/2) 
> tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_x86_64_pc: 
> PASS (2.58 s)
>   (2/2) 
> tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_x86_64_microvm: 
>
> Output: 'qemu-system-x86_64: -machine microvm: unsupported machine 
> type\nUse -machine help to list supported machines\n'
> ERROR: timed out (15.10 s)
>
> Do you mind testing the series testing a machine is available?
> https://www.mail-archive.com/address@hidden/msg675086.html


Sure. I'll test/review those.

Regards,
Liam