From nobody Tue Feb 10 02:43:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1636388317; cv=none; d=zohomail.com; s=zohoarc; b=RYdjpHj2ep9+Kt5/S5jfXFof2N3mrYLlsx3e5PiXGO4pdHQYugz69kWVOMCssBE5Cu7qk3gcX1PUqBOdFvs+aoNVV6Ss3j0uIjC4ZlTYav45YOodlXrc1SEaJYH77KRj4/G+jE7N5L1ldQl4PeSjp82z/8F80MZ4Jd3wvHzoD00= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388317; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=CMqG6mAm9zQwPYQe4nKgR3AQM0SCvgUZiukGkk5yY6Q=; b=ie/0bvff7kSejm6Iqvg6bOmWZYLEdbJAHNcdPyJ1AQRkyGmb9/y6xIzUW5xnlT4c+kLnQ6iLmpe3Ch3A8ViBIo98aQHyj6ImmpGWoVfNmFFplo0vLjicOa8SLm+RMhFOugVnhnA8F5AimNMdzd4Rci5xnZv4l2Lka344dx6g6FE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1636388317676600.6798743362724; Mon, 8 Nov 2021 08:18:37 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-147-mgiDoOsgO32Yu9tRQD4m7w-1; Mon, 08 Nov 2021 11:18:26 -0500 Received: by mail-wr1-f72.google.com with SMTP id h13-20020adfa4cd000000b001883fd029e8so3577719wrb.11 for ; Mon, 08 Nov 2021 08:18:26 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (46.red-193-152-127.dynamicip.rima-tde.net. [193.152.127.46]) by smtp.gmail.com with ESMTPSA id h15sm18024149wmq.32.2021.11.08.08.18.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388316; 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=CMqG6mAm9zQwPYQe4nKgR3AQM0SCvgUZiukGkk5yY6Q=; b=UaXDCqYTkwgMVEqX7yqeP1qS70w1dSTeONqbQsp99m49RT+w6cOz96BfGRYG/T0JTseL5I iL7HD1jfAgG+9lhP9yp/UqOeZQflshVkDt73bd935/pszVd6QTICHlqH32yiBKCZmr52uv zSyps0Ay80+YW/buK3Wdh0NAjCftbTg= X-MC-Unique: mgiDoOsgO32Yu9tRQD4m7w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CMqG6mAm9zQwPYQe4nKgR3AQM0SCvgUZiukGkk5yY6Q=; b=W86tAso9MNWVzJ2wvn5kCIaQDzNEbHBu/ij42fG+7KMbqC599T/eJNxaIoUJ5DDOlT Si7ob0+9+6mRFr2C/dlfW66HThYxx64FwKsJUUwrsNW/b6LluHJn9Og8sdsWfZjVibDz RMfNzVzEApNI06s+GjNVCjDJN2fAy2CaZYuzDiYk3lUuYA91/pcjeScgZSSHavxq1ndf 2Xn9P31qJc47iCFwqcpHN9Lv4UNLj46ICg2iHFuSGzX74b1TZrlIxuC+cSyjWUYZeWEu wUT/gHLufNR6uiOimMALvs+9iSiKZBXh8H0EN3T5qyPm0L/+vrHj58PAWQze3WMmZKer EZlw== X-Gm-Message-State: AOAM530MwOqnW1NDocFs/V+evlkymbtnqBfNSGb0oMtv38ADPkkRZNWI P8AoIP5Of9NMIQVhoj3XE/SWc2FzG/wHQWFqwXYdes+iYtEgosQVWgLGnNsgq/gKFOSJqepRpHc vtxSnlLkphKLIXQ== X-Received: by 2002:a7b:c04b:: with SMTP id u11mr53428472wmc.127.1636388305051; Mon, 08 Nov 2021 08:18:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLhPw6XWTjpFmgQaJPDgDK1GZ9FMxu8nZc963FogoQhTLToeo6Ldlzzltvt+L2+QTYbkdUYA== X-Received: by 2002:a7b:c04b:: with SMTP id u11mr53428425wmc.127.1636388304625; Mon, 08 Nov 2021 08:18:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Cleber Rosa , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 8/9] tests/avocado: Rename avocado_qemu.Test -> QemuSystemTest Date: Mon, 8 Nov 2021 17:17:38 +0100 Message-Id: <20211108161739.1371503-9-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211108161739.1371503-1-philmd@redhat.com> References: <20211108161739.1371503-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1636388319404100001 From: Philippe Mathieu-Daud=C3=A9 To run user-mode emulation tests, we introduced the avocado_qemu.QemuUserTest which inherits from avocado_qemu.QemuBaseTest. System-mode emulation tests are based on the avocado_qemu.Test class, which also inherits avocado_qemu.QemuBaseTest. To avoid confusion, rename it as avocado_qemu.QemuSystemTest. Suggested-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211105143416.148332-7-f4bug@amsat.org> --- docs/devel/testing.rst | 8 ++++---- tests/avocado/avocado_qemu/__init__.py | 21 +++++++++------------ tests/avocado/boot_linux_console.py | 4 ++-- tests/avocado/cpu_queries.py | 4 ++-- tests/avocado/empty_cpu_model.py | 4 ++-- tests/avocado/info_usernet.py | 4 ++-- tests/avocado/linux_initrd.py | 4 ++-- tests/avocado/linux_ssh_mips_malta.py | 5 +++-- tests/avocado/machine_arm_canona1100.py | 4 ++-- tests/avocado/machine_arm_integratorcp.py | 4 ++-- tests/avocado/machine_arm_n8x0.py | 4 ++-- tests/avocado/machine_avr6.py | 4 ++-- tests/avocado/machine_m68k_nextcube.py | 4 ++-- tests/avocado/machine_microblaze.py | 4 ++-- tests/avocado/machine_mips_fuloong2e.py | 4 ++-- tests/avocado/machine_mips_loongson3v.py | 4 ++-- tests/avocado/machine_mips_malta.py | 4 ++-- tests/avocado/machine_rx_gdbsim.py | 4 ++-- tests/avocado/machine_s390_ccw_virtio.py | 4 ++-- tests/avocado/machine_sparc_leon3.py | 4 ++-- tests/avocado/migration.py | 4 ++-- tests/avocado/multiprocess.py | 4 ++-- tests/avocado/pc_cpu_hotplug_props.py | 4 ++-- tests/avocado/ppc_405.py | 4 ++-- tests/avocado/ppc_bamboo.py | 4 ++-- tests/avocado/ppc_mpc8544ds.py | 4 ++-- tests/avocado/ppc_prep_40p.py | 4 ++-- tests/avocado/ppc_pseries.py | 4 ++-- tests/avocado/ppc_virtex_ml507.py | 4 ++-- tests/avocado/version.py | 4 ++-- tests/avocado/virtio-gpu.py | 4 ++-- tests/avocado/virtio_check_params.py | 4 ++-- tests/avocado/virtio_version.py | 4 ++-- tests/avocado/vnc.py | 4 ++-- tests/avocado/x86_cpu_model_versions.py | 4 ++-- 35 files changed, 80 insertions(+), 82 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index dc5dbd057db..60c59023e58 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -811,10 +811,10 @@ class. Here's a simple usage example: =20 .. code:: =20 - from avocado_qemu import Test + from avocado_qemu import QemuSystemTest =20 =20 - class Version(Test): + class Version(QemuSystemTest): """ :avocado: tags=3Dquick """ @@ -859,10 +859,10 @@ and hypothetical example follows: =20 .. code:: =20 - from avocado_qemu import Test + from avocado_qemu import QemuSystemTest =20 =20 - class MultipleMachines(Test): + class MultipleMachines(QemuSystemTest): def test_multiple_machines(self): first_machine =3D self.get_vm() second_machine =3D self.get_vm() diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 1efc22dabfa..75063c0c301 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -176,7 +176,7 @@ def interrupt_interactive_console_until_pattern(test, s= uccess_message, =20 :param test: an Avocado test containing a VM that will have its console read and probed for a success or failure message - :type test: :class:`avocado_qemu.Test` + :type test: :class:`avocado_qemu.QemuSystemTest` :param success_message: if this message appears, test succeeds :param failure_message: if this message appears, test fails :param interrupt_string: a string to send to the console before trying @@ -192,7 +192,7 @@ def wait_for_console_pattern(test, success_message, fai= lure_message=3DNone, =20 :param test: an Avocado test containing a VM that will have its console read and probed for a success or failure message - :type test: :class:`avocado_qemu.Test` + :type test: :class:`avocado_qemu.QemuSystemTest` :param success_message: if this message appears, test succeeds :param failure_message: if this message appears, test fails """ @@ -204,7 +204,7 @@ def exec_command(test, command): the content. =20 :param test: an Avocado test containing a VM. - :type test: :class:`avocado_qemu.Test` + :type test: :class:`avocado_qemu.QemuSystemTest` :param command: the command to send :type command: str """ @@ -219,7 +219,7 @@ def exec_command_and_wait_for_pattern(test, command, =20 :param test: an Avocado test containing a VM that will have its console read and probed for a success or failure message - :type test: :class:`avocado_qemu.Test` + :type test: :class:`avocado_qemu.QemuSystemTest` :param command: the command to send :param success_message: if this message appears, test succeeds :param failure_message: if this message appears, test fails @@ -262,11 +262,8 @@ def fetch_asset(self, name, cancel_on_missing=3Dcancel_on_missing) =20 =20 -class Test(QemuBaseTest): - """Facilitates system emulation tests. - - TODO: Rename this class as `QemuSystemTest`. - """ +class QemuSystemTest(QemuBaseTest): + """Facilitates system emulation tests.""" =20 def setUp(self): self._vms =3D {} @@ -508,11 +505,11 @@ def default_kernel_params(self): return self._info.get('kernel_params', None) =20 =20 -class LinuxTest(LinuxSSHMixIn, Test): +class LinuxTest(LinuxSSHMixIn, QemuSystemTest): """Facilitates having a cloud-image Linux based available. =20 - For tests that indend to interact with guests, this is a better choice - to start with than the more vanilla `Test` class. + For tests that indent to interact with guests, this is a better choice + to start with than the more vanilla `QemuSystemTest` class. """ =20 timeout =3D 900 diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 06fc967f6c4..4ed01ed7893 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -15,7 +15,7 @@ =20 from avocado import skip from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import interrupt_interactive_console_until_pattern @@ -46,7 +46,7 @@ def image_pow2ceil_expand(path): with open(path, 'ab+') as fd: fd.truncate(size_aligned) =20 -class LinuxKernelTest(Test): +class LinuxKernelTest(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 def wait_for_console_pattern(self, success_message, vm=3DNone): diff --git a/tests/avocado/cpu_queries.py b/tests/avocado/cpu_queries.py index cc9e380cc7f..cf69f69b116 100644 --- a/tests/avocado/cpu_queries.py +++ b/tests/avocado/cpu_queries.py @@ -8,9 +8,9 @@ # 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 avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 -class QueryCPUModelExpansion(Test): +class QueryCPUModelExpansion(QemuSystemTest): """ Run query-cpu-model-expansion for each CPU model, and validate results """ diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_mod= el.py index a1e59e45e4e..22f504418d2 100644 --- a/tests/avocado/empty_cpu_model.py +++ b/tests/avocado/empty_cpu_model.py @@ -7,9 +7,9 @@ # # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 -class EmptyCPUModel(Test): +class EmptyCPUModel(QemuSystemTest): def test(self): self.vm.add_args('-S', '-display', 'none', '-machine', 'none', '-c= pu', '') self.vm.set_qmp_monitor(enabled=3DFalse) diff --git a/tests/avocado/info_usernet.py b/tests/avocado/info_usernet.py index 9c1fd903a0b..dc01f74150c 100644 --- a/tests/avocado/info_usernet.py +++ b/tests/avocado/info_usernet.py @@ -8,12 +8,12 @@ # 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 avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 from qemu.utils import get_info_usernet_hostfwd_port =20 =20 -class InfoUsernet(Test): +class InfoUsernet(QemuSystemTest): =20 def test_hostfwd(self): self.vm.add_args('-netdev', 'user,id=3Dvnet,hostfwd=3D:127.0.0.1:0= -:22') diff --git a/tests/avocado/linux_initrd.py b/tests/avocado/linux_initrd.py index 9b4880cd8c2..ba02e5a563d 100644 --- a/tests/avocado/linux_initrd.py +++ b/tests/avocado/linux_initrd.py @@ -12,11 +12,11 @@ import logging import tempfile =20 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado import skipIf =20 =20 -class LinuxInitrd(Test): +class LinuxInitrd(QemuSystemTest): """ Checks QEMU evaluates correctly the initrd file passed as -initrd opti= on. =20 diff --git a/tests/avocado/linux_ssh_mips_malta.py b/tests/avocado/linux_ss= h_mips_malta.py index 4de19474188..c0f0be5adee 100644 --- a/tests/avocado/linux_ssh_mips_malta.py +++ b/tests/avocado/linux_ssh_mips_malta.py @@ -12,7 +12,8 @@ import time =20 from avocado import skipUnless -from avocado_qemu import Test, LinuxSSHMixIn +from avocado_qemu import LinuxSSHMixIn +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive @@ -21,7 +22,7 @@ =20 @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') @skipUnless(ssh.SSH_CLIENT_BINARY, 'No SSH client available') -class LinuxSSH(Test, LinuxSSHMixIn): +class LinuxSSH(QemuSystemTest, LinuxSSHMixIn): =20 timeout =3D 150 # Not for 'configure --enable-debug --enable-debug-tcg' =20 diff --git a/tests/avocado/machine_arm_canona1100.py b/tests/avocado/machin= e_arm_canona1100.py index 0e5c43dbcf8..182a0b05134 100644 --- a/tests/avocado/machine_arm_canona1100.py +++ b/tests/avocado/machine_arm_canona1100.py @@ -8,11 +8,11 @@ # 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 avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado.utils import archive =20 -class CanonA1100Machine(Test): +class CanonA1100Machine(QemuSystemTest): """Boots the barebox firmware and checks that the console is operation= al""" =20 timeout =3D 90 diff --git a/tests/avocado/machine_arm_integratorcp.py b/tests/avocado/mach= ine_arm_integratorcp.py index 49c8ebff78b..1ffe1073ef8 100644 --- a/tests/avocado/machine_arm_integratorcp.py +++ b/tests/avocado/machine_arm_integratorcp.py @@ -12,7 +12,7 @@ import logging =20 from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 =20 @@ -29,7 +29,7 @@ CV2_AVAILABLE =3D False =20 =20 -class IntegratorMachine(Test): +class IntegratorMachine(QemuSystemTest): =20 timeout =3D 90 =20 diff --git a/tests/avocado/machine_arm_n8x0.py b/tests/avocado/machine_arm_= n8x0.py index e5741f2d8d1..12e9a6803ba 100644 --- a/tests/avocado/machine_arm_n8x0.py +++ b/tests/avocado/machine_arm_n8x0.py @@ -11,10 +11,10 @@ import os =20 from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 -class N8x0Machine(Test): +class N8x0Machine(QemuSystemTest): """Boots the Linux kernel and checks that the console is operational""" =20 timeout =3D 90 diff --git a/tests/avocado/machine_avr6.py b/tests/avocado/machine_avr6.py index 6bab31342aa..5485db79c68 100644 --- a/tests/avocado/machine_avr6.py +++ b/tests/avocado/machine_avr6.py @@ -19,9 +19,9 @@ =20 import time =20 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 -class AVR6Machine(Test): +class AVR6Machine(QemuSystemTest): timeout =3D 5 =20 def test_freertos(self): diff --git a/tests/avocado/machine_m68k_nextcube.py b/tests/avocado/machine= _m68k_nextcube.py index 09e2745cc52..6790e7d9cd1 100644 --- a/tests/avocado/machine_m68k_nextcube.py +++ b/tests/avocado/machine_m68k_nextcube.py @@ -8,7 +8,7 @@ import os import time =20 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado import skipUnless =20 from tesseract_utils import tesseract_available, tesseract_ocr @@ -20,7 +20,7 @@ PIL_AVAILABLE =3D False =20 =20 -class NextCubeMachine(Test): +class NextCubeMachine(QemuSystemTest): """ :avocado: tags=3Darch:m68k :avocado: tags=3Dmachine:next-cube diff --git a/tests/avocado/machine_microblaze.py b/tests/avocado/machine_mi= croblaze.py index 7f6d18495d8..4928920f960 100644 --- a/tests/avocado/machine_microblaze.py +++ b/tests/avocado/machine_microblaze.py @@ -5,11 +5,11 @@ # 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 avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado.utils import archive =20 -class MicroblazeMachine(Test): +class MicroblazeMachine(QemuSystemTest): =20 timeout =3D 90 =20 diff --git a/tests/avocado/machine_mips_fuloong2e.py b/tests/avocado/machin= e_mips_fuloong2e.py index 0ac285e2af1..89291f47b24 100644 --- a/tests/avocado/machine_mips_fuloong2e.py +++ b/tests/avocado/machine_mips_fuloong2e.py @@ -10,10 +10,10 @@ import os =20 from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 -class MipsFuloong2e(Test): +class MipsFuloong2e(QemuSystemTest): =20 timeout =3D 60 =20 diff --git a/tests/avocado/machine_mips_loongson3v.py b/tests/avocado/machi= ne_mips_loongson3v.py index 85b131a40f0..5194cf18c9c 100644 --- a/tests/avocado/machine_mips_loongson3v.py +++ b/tests/avocado/machine_mips_loongson3v.py @@ -11,10 +11,10 @@ import time =20 from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 -class MipsLoongson3v(Test): +class MipsLoongson3v(QemuSystemTest): timeout =3D 60 =20 @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') diff --git a/tests/avocado/machine_mips_malta.py b/tests/avocado/machine_mi= ps_malta.py index b67d8cb141c..f1895d59f35 100644 --- a/tests/avocado/machine_mips_malta.py +++ b/tests/avocado/machine_mips_malta.py @@ -12,7 +12,7 @@ import logging =20 from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado.utils import archive from avocado import skipIf @@ -33,7 +33,7 @@ =20 @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed') @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed') -class MaltaMachineFramebuffer(Test): +class MaltaMachineFramebuffer(QemuSystemTest): =20 timeout =3D 30 =20 diff --git a/tests/avocado/machine_rx_gdbsim.py b/tests/avocado/machine_rx_= gdbsim.py index 32b737b6d85..6cd8704b016 100644 --- a/tests/avocado/machine_rx_gdbsim.py +++ b/tests/avocado/machine_rx_gdbsim.py @@ -11,13 +11,13 @@ import os =20 from avocado import skipIf -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import wait_for_console_pattern from avocado.utils import archive =20 =20 -class RxGdbSimMachine(Test): +class RxGdbSimMachine(QemuSystemTest): =20 timeout =3D 30 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' diff --git a/tests/avocado/machine_s390_ccw_virtio.py b/tests/avocado/machi= ne_s390_ccw_virtio.py index 4028c99afce..bd03d7160b4 100644 --- a/tests/avocado/machine_s390_ccw_virtio.py +++ b/tests/avocado/machine_s390_ccw_virtio.py @@ -13,12 +13,12 @@ import tempfile =20 from avocado import skipIf -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import wait_for_console_pattern from avocado.utils import archive =20 -class S390CCWVirtioMachine(Test): +class S390CCWVirtioMachine(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 timeout =3D 120 diff --git a/tests/avocado/machine_sparc_leon3.py b/tests/avocado/machine_s= parc_leon3.py index 2405cd7a0d7..e61b223185a 100644 --- a/tests/avocado/machine_sparc_leon3.py +++ b/tests/avocado/machine_sparc_leon3.py @@ -5,12 +5,12 @@ # 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 avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado import skip =20 =20 -class Leon3Machine(Test): +class Leon3Machine(QemuSystemTest): =20 timeout =3D 60 =20 diff --git a/tests/avocado/migration.py b/tests/avocado/migration.py index 792639cb693..584d6ef53f5 100644 --- a/tests/avocado/migration.py +++ b/tests/avocado/migration.py @@ -11,7 +11,7 @@ =20 =20 import tempfile -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado import skipUnless =20 from avocado.utils import network @@ -19,7 +19,7 @@ from avocado.utils.path import find_command =20 =20 -class Migration(Test): +class Migration(QemuSystemTest): """ :avocado: tags=3Dmigration """ diff --git a/tests/avocado/multiprocess.py b/tests/avocado/multiprocess.py index 96627f022a8..80a3b8f442b 100644 --- a/tests/avocado/multiprocess.py +++ b/tests/avocado/multiprocess.py @@ -7,12 +7,12 @@ import os import socket =20 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern =20 -class Multiprocess(Test): +class Multiprocess(QemuSystemTest): """ :avocado: tags=3Dmultiprocess """ diff --git a/tests/avocado/pc_cpu_hotplug_props.py b/tests/avocado/pc_cpu_h= otplug_props.py index 2e86d5017a5..52b878188ed 100644 --- a/tests/avocado/pc_cpu_hotplug_props.py +++ b/tests/avocado/pc_cpu_hotplug_props.py @@ -20,9 +20,9 @@ # License along with this library; if not, see . # =20 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 -class OmittedCPUProps(Test): +class OmittedCPUProps(QemuSystemTest): """ :avocado: tags=3Darch:x86_64 :avocado: tags=3Dcpu:qemu64 diff --git a/tests/avocado/ppc_405.py b/tests/avocado/ppc_405.py index c534d5d32f2..a47f89b9346 100644 --- a/tests/avocado/ppc_405.py +++ b/tests/avocado/ppc_405.py @@ -6,11 +6,11 @@ # later. See the COPYING file in the top-level directory. =20 from avocado.utils import archive -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command_and_wait_for_pattern =20 -class Ppc405Machine(Test): +class Ppc405Machine(QemuSystemTest): =20 timeout =3D 90 =20 diff --git a/tests/avocado/ppc_bamboo.py b/tests/avocado/ppc_bamboo.py index dd33bf66f32..40629e34789 100644 --- a/tests/avocado/ppc_bamboo.py +++ b/tests/avocado/ppc_bamboo.py @@ -6,11 +6,11 @@ # later. See the COPYING file in the top-level directory. =20 from avocado.utils import archive -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command_and_wait_for_pattern =20 -class BambooMachine(Test): +class BambooMachine(QemuSystemTest): =20 timeout =3D 90 =20 diff --git a/tests/avocado/ppc_mpc8544ds.py b/tests/avocado/ppc_mpc8544ds.py index ce840600c1c..886f967b15a 100644 --- a/tests/avocado/ppc_mpc8544ds.py +++ b/tests/avocado/ppc_mpc8544ds.py @@ -6,10 +6,10 @@ # later. See the COPYING file in the top-level directory. =20 from avocado.utils import archive -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 -class Mpc8544dsMachine(Test): +class Mpc8544dsMachine(QemuSystemTest): =20 timeout =3D 90 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' diff --git a/tests/avocado/ppc_prep_40p.py b/tests/avocado/ppc_prep_40p.py index 5e61e686bd0..4bd956584d6 100644 --- a/tests/avocado/ppc_prep_40p.py +++ b/tests/avocado/ppc_prep_40p.py @@ -8,11 +8,11 @@ import os =20 from avocado import skipUnless -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 =20 -class IbmPrep40pMachine(Test): +class IbmPrep40pMachine(QemuSystemTest): =20 timeout =3D 60 =20 diff --git a/tests/avocado/ppc_pseries.py b/tests/avocado/ppc_pseries.py index f14a884ee16..d8b04dc3ead 100644 --- a/tests/avocado/ppc_pseries.py +++ b/tests/avocado/ppc_pseries.py @@ -6,10 +6,10 @@ # later. See the COPYING file in the top-level directory. =20 from avocado.utils import archive -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 -class pseriesMachine(Test): +class pseriesMachine(QemuSystemTest): =20 timeout =3D 90 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' diff --git a/tests/avocado/ppc_virtex_ml507.py b/tests/avocado/ppc_virtex_m= l507.py index 27f7bf2d492..a6912ee5793 100644 --- a/tests/avocado/ppc_virtex_ml507.py +++ b/tests/avocado/ppc_virtex_ml507.py @@ -6,10 +6,10 @@ # later. See the COPYING file in the top-level directory. =20 from avocado.utils import archive -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern =20 -class VirtexMl507Machine(Test): +class VirtexMl507Machine(QemuSystemTest): =20 timeout =3D 90 KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' diff --git a/tests/avocado/version.py b/tests/avocado/version.py index 79b923d4fc0..ded7f039c1b 100644 --- a/tests/avocado/version.py +++ b/tests/avocado/version.py @@ -9,10 +9,10 @@ # later. See the COPYING file in the top-level directory. =20 =20 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 =20 -class Version(Test): +class Version(QemuSystemTest): """ :avocado: tags=3Dquick """ diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py index 4acc1e6d5fd..2a249a3a2c1 100644 --- a/tests/avocado/virtio-gpu.py +++ b/tests/avocado/virtio-gpu.py @@ -4,8 +4,8 @@ # later. See the COPYING file in the top-level directory. =20 =20 -from avocado_qemu import Test from avocado_qemu import BUILD_DIR +from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command_and_wait_for_pattern from avocado_qemu import is_readable_executable_file @@ -27,7 +27,7 @@ def pick_default_vug_bin(): return bld_dir_path =20 =20 -class VirtioGPUx86(Test): +class VirtioGPUx86(QemuSystemTest): """ :avocado: tags=3Dvirtio-gpu :avocado: tags=3Darch:x86_64 diff --git a/tests/avocado/virtio_check_params.py b/tests/avocado/virtio_ch= eck_params.py index 87e6c839d14..e869690473a 100644 --- a/tests/avocado/virtio_check_params.py +++ b/tests/avocado/virtio_check_params.py @@ -24,7 +24,7 @@ =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) from qemu.machine import QEMUMachine -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest from avocado import skip =20 #list of machine types and virtqueue properties to test @@ -41,7 +41,7 @@ 'driver=3Dnull-co,id=3Ddrive0,if=3Dnon= e']} =20 =20 -class VirtioMaxSegSettingsCheck(Test): +class VirtioMaxSegSettingsCheck(QemuSystemTest): @staticmethod def make_pattern(props): pattern_items =3D ['{0} =3D \w+'.format(prop) for prop in props] diff --git a/tests/avocado/virtio_version.py b/tests/avocado/virtio_version= .py index 33593c29dd0..208910bb844 100644 --- a/tests/avocado/virtio_version.py +++ b/tests/avocado/virtio_version.py @@ -13,7 +13,7 @@ =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'pytho= n')) from qemu.machine import QEMUMachine -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 # Virtio Device IDs: VIRTIO_NET =3D 1 @@ -55,7 +55,7 @@ def get_pci_interfaces(vm, devtype): interfaces =3D ('pci-express-device', 'conventional-pci-device') return [i for i in interfaces if devtype_implements(vm, devtype, i)] =20 -class VirtioVersionCheck(Test): +class VirtioVersionCheck(QemuSystemTest): """ Check if virtio-version-specific device types result in the same device tree created by `disable-modern` and diff --git a/tests/avocado/vnc.py b/tests/avocado/vnc.py index f301fbb4f56..096432988fb 100644 --- a/tests/avocado/vnc.py +++ b/tests/avocado/vnc.py @@ -8,10 +8,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 -from avocado_qemu import Test +from avocado_qemu import QemuSystemTest =20 =20 -class Vnc(Test): +class Vnc(QemuSystemTest): """ :avocado: tags=3Dvnc,quick """ diff --git a/tests/avocado/x86_cpu_model_versions.py b/tests/avocado/x86_cp= u_model_versions.py index 0e9feda62d4..a6edf74c1cc 100644 --- a/tests/avocado/x86_cpu_model_versions.py +++ b/tests/avocado/x86_cpu_model_versions.py @@ -24,7 +24,7 @@ import avocado_qemu import re =20 -class X86CPUModelAliases(avocado_qemu.Test): +class X86CPUModelAliases(avocado_qemu.QemuSystemTest): """ Validation of PC CPU model versions and CPU model aliases =20 @@ -239,7 +239,7 @@ def test_none_alias(self): self.validate_aliases(cpus) =20 =20 -class CascadelakeArchCapabilities(avocado_qemu.Test): +class CascadelakeArchCapabilities(avocado_qemu.QemuSystemTest): """ Validation of Cascadelake arch-capabilities =20 --=20 2.31.1