From nobody Mon Feb 9 23:04:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1636122865; cv=none; d=zohomail.com; s=zohoarc; b=XZ66u/v426fd4cxMkgAhV6x+oSv6kZxFaVRUYodXGaQUboHoL0nsYLxiCjb49zTUIUWmfWTygzmuu7AkP1K06v8VV9HH2dQv9T1oYH5XDoMsaOAoKSAvb8akbF2WFjuB0Iq4vFHDKGIxMDAUPSnglXjmrr1Dxn2fsuoaw+nDRHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636122865; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rI+pJRZdgBJj1qAySozCFJaw5RK4SLLby5wlQgBeonc=; b=NK3FrVIjOEMQCJhiLKdVuuVllZvgF4hjpsErUhRAfdrzDcnhawpFWI1lD5+sxYmSLMZuGHNd7m+vx/ABu0rOuRVhN/l1tqfZpMrupkPse/W/0W6tw/nzRV1sh31LOzce6JFGBfE137yFUtmBzEtguG1skVtYuDbAa8o1GncAWPU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1636122865670441.3548652193417; Fri, 5 Nov 2021 07:34:25 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id w29so2501950wra.12 for ; Fri, 05 Nov 2021 07:34:25 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id t127sm11824903wma.9.2021.11.05.07.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 07:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rI+pJRZdgBJj1qAySozCFJaw5RK4SLLby5wlQgBeonc=; b=FgIIY4pI2THzfPqUiIRyeb1eVVEiuHlpw/7awK1H58lmd2rC5+rznDvZRwdovacy2d 1gmG0Yk5RXUARMd42QnYw0hGvsAmeXLLgrmWqOf/XpBzRAPGSmweuQCQKTX2HIJYp5YI SoXFPjy6c0sVcf7PqkLD/EnduUskGIbfO+f86ageeiLRFGX369jA/JfBkAZlzVSbZzPy GjZgzBOXfio/3myEfWmW5qdCi8ksLPJW/vs7LZH+waXLrShUjOlYRgRqQ1y2ucRC0gfa znIV7hfs43kugKFgPLn0AKMSUPtsBIYXbVTG65PI3wNBd6CSElrND3co/JqLriA1FZi1 QVmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rI+pJRZdgBJj1qAySozCFJaw5RK4SLLby5wlQgBeonc=; b=tXYCF4RrS8hI5sSCqrAxttXsUe4ZzjBfLpRBVglkPdr1/aGJvkapAwIypHp+hK6+5b kG88NznOp9SrmTQsXfEwYkAeDBYIHVw0BsgithCYssexPYrpdOPqklGuVdifX+fcv2V1 sAFFEiCQa1WbIgWjgp+ZvADq6qtVCJRJFmVrBKLZqw/7OSf3gHDX6+6q+UoW4RiwREXX 90zg0ayfsRsmTe02NgP6lMAAJzYHtTMnbB/7vCQtjAhrCBeOqlgCad+Nh8X26VtunHM/ tyrhcloUuqz0zb6hqhSeUAol/PXk4lY7aTcS8Qd5yMG+jo/GmoHJa9KXNLu3MESd7aan Pydg== X-Gm-Message-State: AOAM532YlcTO0d0kulWFvM61PnjlN1E8NXu9VG/y74ER6hF5F2bIId5f VUtCswoPqGJDuk7UJMTVqpaASimOvmk= X-Google-Smtp-Source: ABdhPJyT+7L2UpE3zviIMHLjMRd7QGL/dLkEvtKkSZYla/bGMFMbRSaq34AtiR3WEmZfYnnC7T/njQ== X-Received: by 2002:a05:6000:1544:: with SMTP id 4mr38806119wry.358.1636122863756; Fri, 05 Nov 2021 07:34:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= 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: [PATCH v6 1/6] tests/acceptance: Extract QemuBaseTest from Test Date: Fri, 5 Nov 2021 15:34:11 +0100 Message-Id: <20211105143416.148332-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211105143416.148332-1-f4bug@amsat.org> References: <20211105143416.148332-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1636122866653100001 The Avocado Test::fetch_asset() is handy to download artifacts before running tests. The current class is named Test but only tests system emulation. As we want to test user emulation, refactor the common code as QemuBaseTest. Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211102084232.2965062-2-f4bug@amsat.org> --- tests/avocado/avocado_qemu/__init__.py | 72 +++++++++++++++----------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index cd21b59e040..a495e106d03 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -169,7 +169,7 @@ def exec_command_and_wait_for_pattern(test, command, """ _console_interaction(test, success_message, failure_message, command += '\r') =20 -class Test(avocado.Test): +class QemuBaseTest(avocado.Test): def _get_unique_tag_val(self, tag_name): """ Gets a tag value, if unique for a key @@ -179,6 +179,46 @@ def _get_unique_tag_val(self, tag_name): return vals.pop() return None =20 + def setUp(self): + self.arch =3D self.params.get('arch', + default=3Dself._get_unique_tag_val('ar= ch')) + + self.cpu =3D self.params.get('cpu', + default=3Dself._get_unique_tag_val('cpu= ')) + + default_qemu_bin =3D pick_default_qemu_bin(arch=3Dself.arch) + self.qemu_bin =3D self.params.get('qemu_bin', + default=3Ddefault_qemu_bin) + if self.qemu_bin is None: + self.cancel("No QEMU binary defined or found in the build tree= ") + + def fetch_asset(self, name, + asset_hash=3DNone, algorithm=3DNone, + locations=3DNone, expire=3DNone, + find_only=3DFalse, cancel_on_missing=3DTrue): + return super().fetch_asset(name, + asset_hash=3Dasset_hash, + algorithm=3Dalgorithm, + locations=3Dlocations, + expire=3Dexpire, + find_only=3Dfind_only, + cancel_on_missing=3Dcancel_on_missing) + + +class Test(QemuBaseTest): + """Facilitates system emulation tests. + + TODO: Rename this class as `QemuSystemTest`. + """ + + def setUp(self): + self._vms =3D {} + + super().setUp() + + self.machine =3D self.params.get('machine', + default=3Dself._get_unique_tag_val(= 'machine')) + def require_accelerator(self, accelerator): """ Requires an accelerator to be available for the test to continue @@ -201,24 +241,6 @@ def require_accelerator(self, accelerator): self.cancel("%s accelerator does not seem to be " "available" % accelerator) =20 - def setUp(self): - self._vms =3D {} - - self.arch =3D self.params.get('arch', - default=3Dself._get_unique_tag_val('ar= ch')) - - self.cpu =3D self.params.get('cpu', - default=3Dself._get_unique_tag_val('cpu= ')) - - self.machine =3D self.params.get('machine', - default=3Dself._get_unique_tag_val(= 'machine')) - - default_qemu_bin =3D pick_default_qemu_bin(arch=3Dself.arch) - self.qemu_bin =3D self.params.get('qemu_bin', - default=3Ddefault_qemu_bin) - if self.qemu_bin is None: - self.cancel("No QEMU binary defined or found in the build tree= ") - def _new_vm(self, name, *args): self._sd =3D tempfile.TemporaryDirectory(prefix=3D"avo_qemu_sock_") vm =3D QEMUMachine(self.qemu_bin, base_temp_dir=3Dself.workdir, @@ -272,18 +294,6 @@ def tearDown(self): self._sd =3D None super().tearDown() =20 - def fetch_asset(self, name, - asset_hash=3DNone, algorithm=3DNone, - locations=3DNone, expire=3DNone, - find_only=3DFalse, cancel_on_missing=3DTrue): - return super().fetch_asset(name, - asset_hash=3Dasset_hash, - algorithm=3Dalgorithm, - locations=3Dlocations, - expire=3Dexpire, - find_only=3Dfind_only, - cancel_on_missing=3Dcancel_on_missing) - =20 class LinuxSSHMixIn: """Contains utility methods for interacting with a guest via SSH.""" --=20 2.31.1