From nobody Mon Feb 9 14:09:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1732901538; cv=none; d=zohomail.com; s=zohoarc; b=Ll4AzDyvizy5iZqvv/2CJsCwfMkucIfl/+Ny4whLPrwhI0y+l+riWy7UO/+ZzyMkoLTm2lM/KGFSzrIt5jqCSHP/YH9LJFzLgAaI/YizCCq4gccH0nScPvgNf2ta0+YZR1EgmljNiEEXdlAqOYtATbKJJLITDpaTw7Q2M4jCvIA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732901538; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JAK1NwpolBu4HfcXYebhJQgGNTwUecncidi+yuhM/+g=; b=Smp5W/Zg7NBWvz3rGBZF+1ckgSTUeQlCjFhXFbKTt023a2g8Ro8Npy//kZ8BBYoxWWsdJPCzIBCKTXiGLk7WeOXYIi3UADcnlic80cG6tKYdu4F2rZ8pi5AIfWZdvOsqvfchwIUlytpf2cn7ZB1+XoFN0yKjx/qeyRqzzL2fGFE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1732901538834924.0460031761637; Fri, 29 Nov 2024 09:32:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tH4qO-0003Ye-Oc; Fri, 29 Nov 2024 12:31:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tH4qN-0003YJ-3p for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:31:51 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tH4qK-0000tS-IA for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:31:50 -0500 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-487-I3RFhJpZMhOGBOBQdHrslA-1; Fri, 29 Nov 2024 12:31:44 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AF5FD1955F37; Fri, 29 Nov 2024 17:31:43 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.37]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A7E4F1955F41; Fri, 29 Nov 2024 17:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732901507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JAK1NwpolBu4HfcXYebhJQgGNTwUecncidi+yuhM/+g=; b=XvM58+TxDHaeRKTTyZvIuv6PFowMMmPQJkirZDClvnn3AA5WrljQo+8qEAAgxID1VrBcA6 uEklAWRMFTWuPfIMz2WJOp9bNWvbdFH/z9DXajsa+qTD9HvWk3/mwEw6f06/CzGiVuzpi1 ydvyO4KQfAipJ9itNaD7hoy5veOXUwU= X-MC-Unique: I3RFhJpZMhOGBOBQdHrslA-1 X-Mimecast-MFC-AGG-ID: I3RFhJpZMhOGBOBQdHrslA From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 07/22] tests/functional: switch to new test skip decorators Date: Fri, 29 Nov 2024 17:31:05 +0000 Message-ID: <20241129173120.761728-8-berrange@redhat.com> In-Reply-To: <20241129173120.761728-1-berrange@redhat.com> References: <20241129173120.761728-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.93, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1732901541278019100 This ensures consistency of behaviour across all the tests, and requires that we provide gitlab bug links when marking a test to be skipped due to unreliability. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- tests/functional/test_acpi_bits.py | 24 +++------------- tests/functional/test_arm_aspeed.py | 6 ++-- tests/functional/test_arm_bflt.py | 7 +++-- tests/functional/test_arm_bpim2u.py | 7 +++-- tests/functional/test_arm_integratorcp.py | 27 ++++++------------ tests/functional/test_arm_orangepi.py | 8 +++--- tests/functional/test_linux_initrd.py | 7 ++--- tests/functional/test_m68k_nextcube.py | 14 +++------ tests/functional/test_mips64el_loongson3v.py | 8 +++--- tests/functional/test_mips64el_malta.py | 30 +++++++------------- tests/functional/test_ppc64_hv.py | 17 ++--------- tests/functional/test_ppc_40p.py | 8 ++---- tests/functional/test_rx_gdbsim.py | 6 ++-- tests/functional/test_sh4_r2d.py | 8 ++---- 14 files changed, 62 insertions(+), 115 deletions(-) diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/test_acp= i_bits.py index 4162faf414..4de5fae37e 100755 --- a/tests/functional/test_acpi_bits.py +++ b/tests/functional/test_acpi_bits.py @@ -48,28 +48,13 @@ Sequence, ) from qemu.machine import QEMUMachine -from unittest import skipIf -from qemu_test import QemuBaseTest, Asset, which +from qemu_test import (QemuBaseTest, Asset, skipIfMissingCommands, + skipIfNotMachine) =20 -deps =3D ["xorriso", "mformat"] # dependent tools needed in the test setup= /box. -supported_platforms =3D ['x86_64'] # supported test platforms. =20 # default timeout of 120 secs is sometimes not enough for bits test. BITS_TIMEOUT =3D 200 =20 -def missing_deps(): - """ returns True if any of the test dependent tools are absent. - """ - for dep in deps: - if which(dep) is None: - return True - return False - -def supported_platform(): - """ checks if the test is running on a supported platform. - """ - return platform.machine() in supported_platforms - class QEMUBitsMachine(QEMUMachine): # pylint: disable=3Dtoo-few-public-met= hods """ A QEMU VM, with isa-debugcon enabled and bits iso passed @@ -112,9 +97,8 @@ def base_args(self): """return the base argument to QEMU binary""" return self._base_args =20 -@skipIf(not supported_platform() or missing_deps(), - 'unsupported platform or dependencies (%s) not installed' \ - % ','.join(deps)) +@skipIfMissingCommands("xorriso", "mformat") +@skipIfNotMachine("x86_64") class AcpiBitsTest(QemuBaseTest): #pylint: disable=3Dtoo-many-instance-att= ributes """ ACPI and SMBIOS tests using biosbits. diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_ar= m_aspeed.py index 068740a813..db872ff05e 100755 --- a/tests/functional/test_arm_aspeed.py +++ b/tests/functional/test_arm_aspeed.py @@ -13,7 +13,9 @@ =20 from qemu_test import (LinuxKernelTest, Asset, exec_command_and_wait_for_pattern, - interrupt_interactive_console_until_pattern, has_cm= d) + interrupt_interactive_console_until_pattern, + skipIfMissingCommands, +) from qemu_test.utils import archive_extract from zipfile import ZipFile from unittest import skipUnless @@ -218,7 +220,7 @@ def test_arm_ast2600_evb_buildroot(self): 'images/ast2600-evb/buildroot-2023.02-tpm/flash.img'), 'a46009ae8a5403a0826d607215e731a8c68d27c14c41e55331706b8f9c7bd997') =20 - @skipUnless(*has_cmd('swtpm')) + @skipIfMissingCommands('swtpm') def test_arm_ast2600_evb_buildroot_tpm(self): self.set_machine('ast2600-evb') =20 diff --git a/tests/functional/test_arm_bflt.py b/tests/functional/test_arm_= bflt.py index cd417ebcfc..74d04fd381 100755 --- a/tests/functional/test_arm_bflt.py +++ b/tests/functional/test_arm_bflt.py @@ -10,8 +10,9 @@ import bz2 =20 from qemu_test import QemuUserTest, Asset, has_cmd +from qemu_test import (QemuUserTest, Asset, skipIfMissingCommands, + skipUntrustedTest) from qemu_test.utils import cpio_extract -from unittest import skipUnless =20 =20 class LoadBFLT(QemuUserTest): @@ -20,8 +21,8 @@ class LoadBFLT(QemuUserTest): ('https://elinux.org/images/5/51/Stm32_mini_rootfs.cpio.bz2'), 'eefb788e4980c9e8d6c9d60ce7d15d4da6bf4fbc6a80f487673824600d5ba9cc= ') =20 - @skipUnless(*has_cmd('cpio')) - @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') + @skipIfMissingCommands('cpio') + @skipUntrustedTest() def test_stm32(self): # See https://elinux.org/STM32#User_Space rootfs_path_bz2 =3D self.ASSET_ROOTFS.fetch() diff --git a/tests/functional/test_arm_bpim2u.py b/tests/functional/test_ar= m_bpim2u.py index 7b1b0a270f..d2108fd4ea 100755 --- a/tests/functional/test_arm_bpim2u.py +++ b/tests/functional/test_arm_bpim2u.py @@ -8,10 +8,11 @@ import os =20 from qemu_test import (LinuxKernelTest, exec_command_and_wait_for_pattern, - Asset, interrupt_interactive_console_until_pattern) + Asset, interrupt_interactive_console_until_pattern, + skipBigDataTest) from qemu_test.utils import (archive_extract, gzip_uncompress, lzma_uncomp= ress, image_pow2ceil_expand) -from unittest import skipUnless + =20 class BananaPiMachine(LinuxKernelTest): =20 @@ -143,7 +144,7 @@ def test_arm_bpim2u_gmac(self): os.remove(dtb_path) os.remove(rootfs_path) =20 - @skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limit= ed') + @skipBigDataTest() def test_arm_bpim2u_openwrt_22_03_3(self): self.set_machine('bpim2u') # This test download a 8.9 MiB compressed image and expand it diff --git a/tests/functional/test_arm_integratorcp.py b/tests/functional/t= est_arm_integratorcp.py index c2c6ff6ac5..a13e82bd31 100755 --- a/tests/functional/test_arm_integratorcp.py +++ b/tests/functional/test_arm_integratorcp.py @@ -15,21 +15,8 @@ import os import logging =20 -from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern -from unittest import skipUnless - - -NUMPY_AVAILABLE =3D True -try: - import numpy as np -except ImportError: - NUMPY_AVAILABLE =3D False - -CV2_AVAILABLE =3D True -try: - import cv2 -except ImportError: - CV2_AVAILABLE =3D False +from qemu_test import (QemuSystemTest, Asset, wait_for_console_pattern, + skipIfMissingImports, skipUntrustedTest) =20 =20 class IntegratorMachine(QemuSystemTest): @@ -62,7 +49,7 @@ def boot_integratorcp(self): '-append', 'printk.time=3D0 console=3DttyAMA0') self.vm.launch() =20 - @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') + @skipUntrustedTest() def test_integratorcp_console(self): """ Boots the Linux kernel and checks that the console is operational @@ -70,13 +57,15 @@ def test_integratorcp_console(self): self.boot_integratorcp() wait_for_console_pattern(self, 'Log in as root') =20 - @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') - @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') - @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') + @skipIfMissingImports("numpy", "cv2") + @skipUntrustedTest() def test_framebuffer_tux_logo(self): """ Boot Linux and verify the Tux logo is displayed on the framebuffer. """ + import numpy as np + import cv2 + screendump_path =3D os.path.join(self.workdir, "screendump.pbm") tuxlogo_path =3D self.ASSET_TUXLOGO.fetch() =20 diff --git a/tests/functional/test_arm_orangepi.py b/tests/functional/test_= arm_orangepi.py index 676327e8ef..7974010320 100755 --- a/tests/functional/test_arm_orangepi.py +++ b/tests/functional/test_arm_orangepi.py @@ -10,10 +10,10 @@ =20 from qemu_test import (LinuxKernelTest, exec_command_and_wait_for_pattern, Asset, interrupt_interactive_console_until_pattern, - wait_for_console_pattern) + wait_for_console_pattern, skipBigDataTest) from qemu_test.utils import (archive_extract, gzip_uncompress, lzma_uncomp= ress, image_pow2ceil_expand) -from unittest import skipUnless + =20 class BananaPiMachine(LinuxKernelTest): =20 @@ -149,7 +149,7 @@ def test_arm_orangepi_sd(self): os.remove(dtb_path) os.remove(rootfs_path) =20 - @skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limit= ed') + @skipBigDataTest() def test_arm_orangepi_armbian(self): self.set_machine('orangepi-pc') # This test download a 275 MiB compressed image and expand it @@ -185,7 +185,7 @@ def test_arm_orangepi_armbian(self): 'to ') self.wait_for_console_pattern('Starting Load Kernel Modules...') =20 - @skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limit= ed') + @skipBigDataTest() def test_arm_orangepi_uboot_netbsd9(self): self.set_machine('orangepi-pc') # This test download a 304MB compressed image and expand it to 2GB diff --git a/tests/functional/test_linux_initrd.py b/tests/functional/test_= linux_initrd.py index c71a59d4c9..2207f83fbf 100755 --- a/tests/functional/test_linux_initrd.py +++ b/tests/functional/test_linux_initrd.py @@ -10,12 +10,10 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -import os import logging import tempfile =20 -from qemu_test import QemuSystemTest, Asset -from unittest import skipUnless +from qemu_test import QemuSystemTest, Asset, skipFlakyTest =20 =20 class LinuxInitrd(QemuSystemTest): @@ -60,7 +58,8 @@ def test_with_2gib_file_should_exit_error_msg_with_linux_= v3_6(self): max_size + 1) self.assertRegex(self.vm.get_log(), expected_msg) =20 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') + # XXX file tracking bug + @skipFlakyTest(bug_url=3DNone) def test_with_2gib_file_should_work_with_linux_v4_16(self): """ QEMU has supported up to 4 GiB initrd for recent kernel diff --git a/tests/functional/test_m68k_nextcube.py b/tests/functional/test= _m68k_nextcube.py index 0124622c40..82d3d335d0 100755 --- a/tests/functional/test_m68k_nextcube.py +++ b/tests/functional/test_m68k_nextcube.py @@ -10,16 +10,9 @@ import os import time =20 -from qemu_test import QemuSystemTest, Asset -from unittest import skipUnless - +from qemu_test import QemuSystemTest, Asset, skipIfMissingImports from qemu_test.tesseract import tesseract_available, tesseract_ocr - -PIL_AVAILABLE =3D True -try: - from PIL import Image -except ImportError: - PIL_AVAILABLE =3D False +from unittest import skipUnless =20 =20 class NextCubeMachine(QemuSystemTest): @@ -43,12 +36,13 @@ def check_bootrom_framebuffer(self, screenshot_path): self.vm.cmd('human-monitor-command', command_line=3D'screendump %s' % screenshot_path) =20 - @skipUnless(PIL_AVAILABLE, 'Python PIL not installed') + @skipIfMissingImports("PIL") def test_bootrom_framebuffer_size(self): self.set_machine('next-cube') screenshot_path =3D os.path.join(self.workdir, "dump.ppm") self.check_bootrom_framebuffer(screenshot_path) =20 + from PIL import Image width, height =3D Image.open(screenshot_path).size self.assertEqual(width, 1120) self.assertEqual(height, 832) diff --git a/tests/functional/test_mips64el_loongson3v.py b/tests/functiona= l/test_mips64el_loongson3v.py index 06032a3a6b..2d1a94e517 100755 --- a/tests/functional/test_mips64el_loongson3v.py +++ b/tests/functional/test_mips64el_loongson3v.py @@ -9,10 +9,10 @@ # # SPDX-License-Identifier: GPL-2.0-or-later =20 -import os - from unittest import skipUnless -from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern +from qemu_test import (QemuSystemTest, Asset, wait_for_console_pattern, + skipUntrustedTest) + =20 class MipsLoongson3v(QemuSystemTest): timeout =3D 60 @@ -22,7 +22,7 @@ class MipsLoongson3v(QemuSystemTest): 'releases/download/20210112/pmon-3avirt.bin'), 'fcdf6bb2cb7885a4a62f31fcb0d5e368bac7b6cea28f40c6dfa678af22fea20a') =20 - @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') + @skipUntrustedTest() def test_pmon_serial_console(self): self.set_machine('loongson3-virt') =20 diff --git a/tests/functional/test_mips64el_malta.py b/tests/functional/tes= t_mips64el_malta.py index b5959d33ea..ccb9616f68 100755 --- a/tests/functional/test_mips64el_malta.py +++ b/tests/functional/test_mips64el_malta.py @@ -13,21 +13,9 @@ import logging =20 from qemu_test import (LinuxKernelTest, Asset, - exec_command_and_wait_for_pattern) + exec_command_and_wait_for_pattern, + skipIfMissingImports, skipFlakyTest, skipUntrustedT= est) from qemu_test.utils import gzip_uncompress -from unittest import skipUnless - -NUMPY_AVAILABLE =3D True -try: - import numpy as np -except ImportError: - NUMPY_AVAILABLE =3D False - -CV2_AVAILABLE =3D True -try: - import cv2 -except ImportError: - CV2_AVAILABLE =3D False =20 =20 class MaltaMachineConsole(LinuxKernelTest): @@ -76,7 +64,7 @@ def test_mips64el_malta(self): 'rootfs.mipsel64r1.cpio.gz'), '75ba10cd35fb44e32948eeb26974f061b703c81c4ba2fab1ebcacf1d1bec3b61') =20 - @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') + @skipUntrustedTest() def test_mips64el_malta_5KEc_cpio(self): kernel_path =3D self.ASSET_KERNEL_3_19_3.fetch() initrd_path_gz =3D self.ASSET_CPIO_R1.fetch() @@ -106,8 +94,7 @@ def test_mips64el_malta_5KEc_cpio(self): self.vm.wait() =20 =20 -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') +@skipIfMissingImports('numpy', 'cv2') class MaltaMachineFramebuffer(LinuxKernelTest): =20 timeout =3D 30 @@ -126,6 +113,10 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_cou= nt): """ Boot Linux kernel and check Tux logo is displayed on the framebuff= er. """ + + import numpy as np + import cv2 + screendump_path =3D os.path.join(self.workdir, 'screendump.pbm') =20 kernel_path_gz =3D self.ASSET_KERNEL_4_7_0.fetch() @@ -171,11 +162,12 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_co= unt): def test_mips_malta_i6400_framebuffer_logo_1core(self): self.do_test_i6400_framebuffer_logo(1) =20 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') + # XXX file tracking bug + @skipFlakyTest(bug_url=3DNone) def test_mips_malta_i6400_framebuffer_logo_7cores(self): self.do_test_i6400_framebuffer_logo(7) =20 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') + @skipFlakyTest(bug_url=3DNone) def test_mips_malta_i6400_framebuffer_logo_8cores(self): self.do_test_i6400_framebuffer_logo(8) =20 diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc6= 4_hv.py index cc77cd22b1..9ad69b4a15 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -9,24 +9,13 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -from unittest import skipIf, skipUnless from qemu_test import (QemuSystemTest, Asset, wait_for_console_pattern, - exec_command, which) + exec_command, skipIfMissingCommands, skipBigDataTes= t) import os import time import subprocess from datetime import datetime =20 -deps =3D ["xorriso"] # dependent tools needed in the test setup/box. - -def missing_deps(): - """ returns True if any of the test dependent tools are absent. - """ - for dep in deps: - if which(dep) is None: - return True - return False - # Alpine is a light weight distro that supports QEMU. These tests boot # that on the machine then run a QEMU guest inside it in KVM mode, # that runs the same Alpine distro image. @@ -34,8 +23,8 @@ def missing_deps(): # large download, but it may be more polite to create qcow2 image with # QEMU already installed and use that. # XXX: The order of these tests seems to matter, see git blame. -@skipIf(missing_deps(), 'dependencies (%s) not installed' % ','.join(deps)) -@skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limited') +@skipIfMissingCommands("xorriso") +@skipBigDataTest() class HypervisorTest(QemuSystemTest): =20 timeout =3D 1000 diff --git a/tests/functional/test_ppc_40p.py b/tests/functional/test_ppc_4= 0p.py index 496282b164..885b8e4ba2 100755 --- a/tests/functional/test_ppc_40p.py +++ b/tests/functional/test_ppc_40p.py @@ -7,10 +7,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 -import os - -from unittest import skipUnless -from qemu_test import QemuSystemTest, Asset, wait_for_console_pattern +from qemu_test import (QemuSystemTest, Asset, wait_for_console_pattern, + skipUntrustedTest) =20 =20 class IbmPrep40pMachine(QemuSystemTest): @@ -36,7 +34,7 @@ class IbmPrep40pMachine(QemuSystemTest): # All rights reserved. # U.S. Government Users Restricted Rights - Use, duplication or disclo= sure # restricted by GSA ADP Schedule Contract with IBM Corp. - @skipUnless(os.getenv('QEMU_TEST_ALLOW_UNTRUSTED_CODE'), 'untrusted co= de') + @skipUntrustedTest() def test_factory_firmware_and_netbsd(self): self.set_machine('40p') self.require_accelerator("tcg") diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/test_rx_= gdbsim.py index 6306863519..7461be0b46 100755 --- a/tests/functional/test_rx_gdbsim.py +++ b/tests/functional/test_rx_gdbsim.py @@ -12,10 +12,9 @@ =20 import os =20 -from unittest import skipUnless from qemu_test import (QemuSystemTest, Asset, exec_command_and_wait_for_pattern, - wait_for_console_pattern) + wait_for_console_pattern, skipFlakyTest) from qemu_test.utils import gzip_uncompress =20 =20 @@ -54,7 +53,8 @@ def test_uboot(self): # FIXME limit baudrate on chardev, else we type too fast #exec_command_and_wait_for_pattern(self, 'version', gcc_version) =20 - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on G= itLab') + # XXX file tracking bug + @skipFlakyTest(bug_url=3DNone) def test_linux_sash(self): """ Boots a Linux kernel and checks that the console is operational. diff --git a/tests/functional/test_sh4_r2d.py b/tests/functional/test_sh4_r= 2d.py index c3cfff79ad..e2fcde2d6b 100755 --- a/tests/functional/test_sh4_r2d.py +++ b/tests/functional/test_sh4_r2d.py @@ -4,11 +4,8 @@ # # SPDX-License-Identifier: GPL-2.0-or-later =20 -import os - -from qemu_test import LinuxKernelTest, Asset +from qemu_test import LinuxKernelTest, Asset, skipFlakyTest from qemu_test.utils import archive_extract -from unittest import skipUnless =20 class R2dTest(LinuxKernelTest): =20 @@ -18,7 +15,8 @@ class R2dTest(LinuxKernelTest): =20 # This test has a 6-10% failure rate on various hosts that look # like issues with a buggy kernel. - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable') + # XXX file tracking bug + @skipFlakyTest(bug_url=3DNone) def test_r2d(self): self.set_machine('r2d') file_path =3D self.ASSET_DAY09.fetch() --=20 2.46.0