tests/avocado: Add missing require_netdev('user') checks

[PATCH] tests/avocado: Add missing require_netdev('user') checks

Posted by Peter Maydell 1 year, 7 months ago

Some avocado tests fail if QEMU was built without libslirp. Add
require_netdev('user') checks where necessary:

These tests try to ping 10.0.2.2 and expect it to succeed:
  boot_linux_console.py:BootLinuxConsole.test_arm_emcraft_sf2
  boot_linux_console.py:BootLinuxConsole.test_arm_orangepi_sd
  ppc_bamboo.py:BambooMachine.test_ppc_bamboo

These tests run a commandline that includes '-net user':
  machine_aspeed.py:AST2x00Machine.test_arm_ast2500_evb_builroot
  (and others that use the do_test_arm_aspeed_buidroot_start()
  or do_test_arm_aspeed_sdk_start() helper functions)

These changes seem to be sufficient for 'make check-avocado'
to not fail on a --disable-slirp build.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tests/avocado/boot_linux_console.py | 4 ++++
 tests/avocado/machine_aspeed.py     | 3 +++
 tests/avocado/ppc_bamboo.py         | 1 +
 3 files changed, 8 insertions(+)

diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index f26e036ab58..ca9d09b0d7c 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -381,6 +381,8 @@ def test_arm_emcraft_sf2(self):
         :avocado: tags=u-boot
         :avocado: tags=accel:tcg
         """
+        self.require_netdev('user')
+
         uboot_url = ('https://raw.githubusercontent.com/'
                      'Subbaraya-Sundeep/qemu-test-binaries/'
                      'fe371d32e50ca682391e1e70ab98c2942aeffb01/u-boot')
@@ -779,6 +781,8 @@ def test_arm_orangepi_sd(self):
         :avocado: tags=machine:orangepi-pc
         :avocado: tags=device:sd
         """
+        self.require_netdev('user')
+
         deb_url = ('https://apt.armbian.com/pool/main/l/'
                    'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
         deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py
index 0f64eb636c2..124649a24b5 100644
--- a/tests/avocado/machine_aspeed.py
+++ b/tests/avocado/machine_aspeed.py
@@ -93,6 +93,8 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
         self.do_test_arm_aspeed(image_path)
 
     def do_test_arm_aspeed_buidroot_start(self, image, cpu_id):
+        self.require_netdev('user')
+
         self.vm.set_console()
         self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
                          '-net', 'nic', '-net', 'user')
@@ -193,6 +195,7 @@ def wait_for_console_pattern(self, success_message, vm=None):
                                  vm=vm)
 
     def do_test_arm_aspeed_sdk_start(self, image, cpu_id):
+        self.require_netdev('user')
         self.vm.set_console()
         self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
                          '-net', 'nic', '-net', 'user')
diff --git a/tests/avocado/ppc_bamboo.py b/tests/avocado/ppc_bamboo.py
index 102ff252dff..a81be3d6088 100644
--- a/tests/avocado/ppc_bamboo.py
+++ b/tests/avocado/ppc_bamboo.py
@@ -23,6 +23,7 @@ def test_ppc_bamboo(self):
         :avocado: tags=accel:tcg
         """
         self.require_accelerator("tcg")
+        self.require_netdev('user')
         tar_url = ('http://landley.net/aboriginal/downloads/binaries/'
                    'system-image-powerpc-440fp.tar.gz')
         tar_hash = '53e5f16414b195b82d2c70272f81c2eedb39bad9'
-- 
2.25.1

Re: [PATCH] tests/avocado: Add missing require_netdev('user') checks

Posted by Thomas Huth 1 year, 6 months ago

On 01/10/2022 21.52, Peter Maydell wrote:
> Some avocado tests fail if QEMU was built without libslirp. Add
> require_netdev('user') checks where necessary:
> 
> These tests try to ping 10.0.2.2 and expect it to succeed:
>    boot_linux_console.py:BootLinuxConsole.test_arm_emcraft_sf2
>    boot_linux_console.py:BootLinuxConsole.test_arm_orangepi_sd
>    ppc_bamboo.py:BambooMachine.test_ppc_bamboo
> 
> These tests run a commandline that includes '-net user':
>    machine_aspeed.py:AST2x00Machine.test_arm_ast2500_evb_builroot
>    (and others that use the do_test_arm_aspeed_buidroot_start()
>    or do_test_arm_aspeed_sdk_start() helper functions)
> 
> These changes seem to be sufficient for 'make check-avocado'
> to not fail on a --disable-slirp build.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   tests/avocado/boot_linux_console.py | 4 ++++
>   tests/avocado/machine_aspeed.py     | 3 +++
>   tests/avocado/ppc_bamboo.py         | 1 +
>   3 files changed, 8 insertions(+)
> 
> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
> index f26e036ab58..ca9d09b0d7c 100644
> --- a/tests/avocado/boot_linux_console.py
> +++ b/tests/avocado/boot_linux_console.py
> @@ -381,6 +381,8 @@ def test_arm_emcraft_sf2(self):
>           :avocado: tags=u-boot
>           :avocado: tags=accel:tcg
>           """
> +        self.require_netdev('user')
> +
>           uboot_url = ('https://raw.githubusercontent.com/'
>                        'Subbaraya-Sundeep/qemu-test-binaries/'
>                        'fe371d32e50ca682391e1e70ab98c2942aeffb01/u-boot')
> @@ -779,6 +781,8 @@ def test_arm_orangepi_sd(self):
>           :avocado: tags=machine:orangepi-pc
>           :avocado: tags=device:sd
>           """
> +        self.require_netdev('user')
> +
>           deb_url = ('https://apt.armbian.com/pool/main/l/'
>                      'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb')
>           deb_hash = '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0'
> diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py
> index 0f64eb636c2..124649a24b5 100644
> --- a/tests/avocado/machine_aspeed.py
> +++ b/tests/avocado/machine_aspeed.py
> @@ -93,6 +93,8 @@ def test_arm_ast2500_romulus_openbmc_v2_9_0(self):
>           self.do_test_arm_aspeed(image_path)
>   
>       def do_test_arm_aspeed_buidroot_start(self, image, cpu_id):
> +        self.require_netdev('user')
> +
>           self.vm.set_console()
>           self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>                            '-net', 'nic', '-net', 'user')
> @@ -193,6 +195,7 @@ def wait_for_console_pattern(self, success_message, vm=None):
>                                    vm=vm)
>   
>       def do_test_arm_aspeed_sdk_start(self, image, cpu_id):
> +        self.require_netdev('user')
>           self.vm.set_console()
>           self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
>                            '-net', 'nic', '-net', 'user')
> diff --git a/tests/avocado/ppc_bamboo.py b/tests/avocado/ppc_bamboo.py
> index 102ff252dff..a81be3d6088 100644
> --- a/tests/avocado/ppc_bamboo.py
> +++ b/tests/avocado/ppc_bamboo.py
> @@ -23,6 +23,7 @@ def test_ppc_bamboo(self):
>           :avocado: tags=accel:tcg
>           """
>           self.require_accelerator("tcg")
> +        self.require_netdev('user')
>           tar_url = ('http://landley.net/aboriginal/downloads/binaries/'
>                      'system-image-powerpc-440fp.tar.gz')
>           tar_hash = '53e5f16414b195b82d2c70272f81c2eedb39bad9'

Reviewed-by: Thomas Huth <thuth@redhat.com>

... and sorry that I missed them in commit 0fc389fe9208f0bfd ... many 
Avocado tests still refuse to run properly on my laptop, so I only fixed 
those that were failing in the gitlab-CI :-/

Re: [PATCH] tests/avocado: Add missing require_netdev('user') checks

Posted by Alex Bennée 1 year, 6 months ago

Peter Maydell <peter.maydell@linaro.org> writes:

> Some avocado tests fail if QEMU was built without libslirp. Add
> require_netdev('user') checks where necessary:
>
> These tests try to ping 10.0.2.2 and expect it to succeed:
>   boot_linux_console.py:BootLinuxConsole.test_arm_emcraft_sf2
>   boot_linux_console.py:BootLinuxConsole.test_arm_orangepi_sd
>   ppc_bamboo.py:BambooMachine.test_ppc_bamboo
>
> These tests run a commandline that includes '-net user':
>   machine_aspeed.py:AST2x00Machine.test_arm_ast2500_evb_builroot
>   (and others that use the do_test_arm_aspeed_buidroot_start()
>   or do_test_arm_aspeed_sdk_start() helper functions)
>
> These changes seem to be sufficient for 'make check-avocado'
> to not fail on a --disable-slirp build.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

I was just about to write such a patch myself ;-)

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

-- 
Alex Bennée

Re: [PATCH] tests/avocado: Add missing require_netdev('user') checks

Posted by Philippe Mathieu-Daudé via 1 year, 6 months ago

On 1/10/22 21:52, Peter Maydell wrote:
> Some avocado tests fail if QEMU was built without libslirp. Add
> require_netdev('user') checks where necessary:
> 
> These tests try to ping 10.0.2.2 and expect it to succeed:
>    boot_linux_console.py:BootLinuxConsole.test_arm_emcraft_sf2
>    boot_linux_console.py:BootLinuxConsole.test_arm_orangepi_sd
>    ppc_bamboo.py:BambooMachine.test_ppc_bamboo
> 
> These tests run a commandline that includes '-net user':
>    machine_aspeed.py:AST2x00Machine.test_arm_ast2500_evb_builroot
>    (and others that use the do_test_arm_aspeed_buidroot_start()
>    or do_test_arm_aspeed_sdk_start() helper functions)
> 
> These changes seem to be sufficient for 'make check-avocado'
> to not fail on a --disable-slirp build.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>   tests/avocado/boot_linux_console.py | 4 ++++
>   tests/avocado/machine_aspeed.py     | 3 +++
>   tests/avocado/ppc_bamboo.py         | 1 +
>   3 files changed, 8 insertions(+)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>