]> xenbits.xensource.com Git - people/aperard/qemu-dm.git/commitdiff
tests/functional: Add missing require_netdev('user') statements
authorThomas Huth <thuth@redhat.com>
Mon, 24 Mar 2025 12:34:50 +0000 (13:34 +0100)
committerThomas Huth <thuth@redhat.com>
Thu, 27 Mar 2025 07:59:35 +0000 (08:59 +0100)
A bunch of tests are using "-netdev user" but fail to check
for the availability of SLIRP in the binary, so these tests
fail if QEMU has been configured with "--disable-slirp"
(most of the tests are disabled by default with a decorator,
that's likely why nobody noticed this problem yet). Add the
missing self.require_netdev('user') statements to skip the
tests if SLIRP is not available.

Message-ID: <20250324123450.111307-1-thuth@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
tests/functional/test_aarch64_rme_sbsaref.py
tests/functional/test_aarch64_rme_virt.py
tests/functional/test_arm_bpim2u.py
tests/functional/test_arm_cubieboard.py
tests/functional/test_arm_orangepi.py
tests/functional/test_ppc64_hv.py
tests/functional/test_x86_64_kvm_xen.py

index ddcc9493a6cf428201bef8f9ec0d90fe4800ff35..0f4f6103a1e59560941b3ce48c08eca8f28e5e6c 100755 (executable)
@@ -33,6 +33,7 @@ class Aarch64RMESbsaRefMachine(QemuSystemTest):
     def test_aarch64_rme_sbsaref(self):
         self.set_machine('sbsa-ref')
         self.require_accelerator('tcg')
+        self.require_netdev('user')
 
         self.vm.set_console()
 
index 38e01721a4e12a0c7dadf31be92680950ef3bca8..f4ad4d33d58d68e1469ff9dc7ca3b180bc2a21fb 100755 (executable)
@@ -60,8 +60,10 @@ class Aarch64RMEVirtMachine(QemuSystemTest):
     # and launching a nested VM using it.
     def test_aarch64_rme_virt(self):
         self.set_machine('virt')
-        self.vm.set_console()
         self.require_accelerator('tcg')
+        self.require_netdev('user')
+
+        self.vm.set_console()
 
         stack_path_tar_gz = self.ASSET_RME_STACK_VIRT.fetch()
         self.archive_extract(stack_path_tar_gz, format="tar")
index 12cd35974609cfd9967c5baa52d9e139f7979cf5..8de6ccba881664e0455b00c67b54c428beb84cfe 100755 (executable)
@@ -140,6 +140,8 @@ class BananaPiMachine(LinuxKernelTest):
     @skipBigDataTest()
     def test_arm_bpim2u_openwrt_22_03_3(self):
         self.set_machine('bpim2u')
+        self.require_netdev('user')
+
         # This test download a 8.9 MiB compressed image and expand it
         # to 127 MiB.
         image_path = self.uncompress(self.ASSET_SD_IMAGE)
index 423db710e82706bfc62615004b8e624621a8a6ca..b87a28154da3c2e68fbd764ba9acdff84e01df15 100755 (executable)
@@ -107,6 +107,8 @@ class CubieboardMachine(LinuxKernelTest):
         # This test download a 7.5 MiB compressed image and expand it
         # to 126 MiB.
         self.set_machine('cubieboard')
+        self.require_netdev('user')
+
         image_path = self.uncompress(self.ASSET_OPENWRT)
         image_pow2ceil_expand(image_path)
 
index 28919391e5d5cda5a122b32ef89bd8117f42cc7f..1815f56e027b6a22f108b2406f5d797b803f9440 100755 (executable)
@@ -147,6 +147,8 @@ class OrangePiMachine(LinuxKernelTest):
     @skipBigDataTest()
     def test_arm_orangepi_armbian(self):
         self.set_machine('orangepi-pc')
+        self.require_netdev('user')
+
         # This test download a 275 MiB compressed image and expand it
         # to 1036 MiB, but the underlying filesystem is 1552 MiB...
         # As we expand it to 2 GiB we are safe.
@@ -181,6 +183,8 @@ class OrangePiMachine(LinuxKernelTest):
     @skipBigDataTest()
     def test_arm_orangepi_uboot_netbsd9(self):
         self.set_machine('orangepi-pc')
+        self.require_netdev('user')
+
         # This test download a 304MB compressed image and expand it to 2GB
         # We use the common OrangePi PC 'plus' build of U-Boot for our secondary
         # program loader (SPL). We will then set the path to the more specific
index 62f996adf6d3c7078e55f5eb49c1f2817f64299e..1920e91f18b828570419fcc63edbf6218fe0cd3b 100755 (executable)
@@ -125,6 +125,7 @@ class HypervisorTest(QemuSystemTest):
 
     def test_hv_pseries(self):
         self.require_accelerator("tcg")
+        self.require_netdev('user')
         self.set_machine('pseries')
         self.vm.add_args("-accel", "tcg,thread=multi")
         self.vm.add_args('-device', 'nvme,serial=1234,drive=drive0')
@@ -136,6 +137,7 @@ class HypervisorTest(QemuSystemTest):
 
     def test_hv_pseries_kvm(self):
         self.require_accelerator("kvm")
+        self.require_netdev('user')
         self.set_machine('pseries')
         self.vm.add_args("-accel", "kvm")
         self.vm.add_args('-device', 'nvme,serial=1234,drive=drive0')
@@ -147,6 +149,7 @@ class HypervisorTest(QemuSystemTest):
 
     def test_hv_powernv(self):
         self.require_accelerator("tcg")
+        self.require_netdev('user')
         self.set_machine('powernv')
         self.vm.add_args("-accel", "tcg,thread=multi")
         self.vm.add_args('-device', 'nvme,bus=pcie.2,addr=0x0,serial=1234,drive=drive0',
index 3bedef6c98c161729627c8fb2b92247625f1f89a..c6abf6bba3bdb006aca2d6f6118be350a607da93 100755 (executable)
@@ -41,6 +41,7 @@ class KVMXenGuest(QemuSystemTest):
     def common_vm_setup(self):
         # We also catch lack of KVM_XEN support if we fail to launch
         self.require_accelerator("kvm")
+        self.require_netdev('user')
 
         self.vm.set_console()