From nobody Mon Mar 2 10:40:47 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1772141729; cv=none; d=zohomail.com; s=zohoarc; b=F7hpBWFJIL1X5B1khhg0glYK+p2hMY1kPvnBlQUA2GIDaZQvJK2bwLLuqGKgqCWXvrOfdCx8ZKt53mXObzN8n2ua1DMt5Ae/Ysgp0zRuFWqYLdLEwhxkj9chZH+9wFJ6w4X7UQivAhGkKBe+GKf/w4skcpLQK51VNZT2SUFgKAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772141729; h=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=Dlfzv2LAtILyKhAMHevh58GrSlOkSP4WJv5T3zOPP1s=; b=QLHDhiUYBWq+g2am1DU+dYIyKVyuthJ9vE2oH6FBZ259OOPzl4zLtvcbom53OyZorzd3fywo9NyNFeqIikYDBqBPisj3n8R3tiR2DTSbTNmaxiLVhizGkcpSErmPnpvsHJIUkEFrrjpKD+MdrkYxRBvk2/WAgYLyywdR1q+mRpk= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1772141729806945.4666965315781; Thu, 26 Feb 2026 13:35:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvizx-0004Ek-7M; Thu, 26 Feb 2026 16:34:17 -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 1vvizv-0004E2-Lc for qemu-devel@nongnu.org; Thu, 26 Feb 2026 16:34:15 -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 1vvizt-0004Hm-V1 for qemu-devel@nongnu.org; Thu, 26 Feb 2026 16:34:15 -0500 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-507-PyP-u_1qOQW8YSGvdyaGkw-1; Thu, 26 Feb 2026 16:34:09 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 870021800259; Thu, 26 Feb 2026 21:34:08 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.88.61]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 29CBB1956053; Thu, 26 Feb 2026 21:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772141653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dlfzv2LAtILyKhAMHevh58GrSlOkSP4WJv5T3zOPP1s=; b=HZIaTQwh6htG8XX5Fty4hyMPmQZ2CrcaMWZuwIXbeI02A4tLVFc8zL28Rr1PTAcL1B0k5j Q48e0Fbw84l6h9BcBhtenX0YZ8mwxUV03knkThyOdT2oWyR12muHt5TRIRaMy5boYzUGPU oI2lnopw2OC7kd81I+L9tYxkPxdz9DM= X-MC-Unique: PyP-u_1qOQW8YSGvdyaGkw-1 X-Mimecast-MFC-AGG-ID: PyP-u_1qOQW8YSGvdyaGkw_1772141648 From: John Snow To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , John Snow , Thomas Huth , Paolo Bonzini Subject: [PATCH v4 2/4] python: replace avocado tests with pytest Date: Thu, 26 Feb 2026 16:33:58 -0500 Message-ID: <20260226213400.1254014-3-jsnow@redhat.com> In-Reply-To: <20260226213400.1254014-1-jsnow@redhat.com> References: <20260226213400.1254014-1-jsnow@redhat.com> MIME-Version: 1.0 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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.306, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.668, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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: 1772141732101158500 Content-Type: text/plain; charset="utf-8" Following suit with the rest of this repository, drop avocado and replace it with the Python standard "pytest" package. Our ultimate goal is to merge these python tests with the meson test suite, so the use of 'pytest' here is only a stop-gap solution to get the GitLab CI 'check-python-tox' passing again following recent Python packaging ecosystem changes. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- python/Makefile | 4 +- python/setup.cfg | 1 + python/tests/linters.py | 79 ++++++++++++++++++++++++++++++++++++++++ python/tests/minreqs.txt | 1 + 4 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 python/tests/linters.py diff --git a/python/Makefile b/python/Makefile index b6c9cd1bce2..42994d39618 100644 --- a/python/Makefile +++ b/python/Makefile @@ -105,7 +105,7 @@ develop: =20 .PHONY: check check: - @avocado --config avocado.cfg run tests/ + @pytest -v tests/*.py =20 .PHONY: check-tox check-tox: @@ -113,7 +113,7 @@ check-tox: =20 .PHONY: check-coverage check-coverage: - @coverage run -m avocado --config avocado.cfg run tests/*.py + @coverage run -m pytest -v tests/*.py @coverage combine @coverage html @coverage report diff --git a/python/setup.cfg b/python/setup.cfg index c46a95f8d41..03344526730 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -43,6 +43,7 @@ devel =3D mypy >=3D 1.4.0 pylint >=3D 2.17.3 pylint !=3D 3.2.4; python_version<"3.9" + pytest >=3D 6.0.2 tox >=3D 3.18.0 sphinx >=3D 3.4.3 =20 diff --git a/python/tests/linters.py b/python/tests/linters.py new file mode 100644 index 00000000000..cce29c0a8ea --- /dev/null +++ b/python/tests/linters.py @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +from subprocess import check_call +import sys + + +class TestLinters: + + def test_flake8_pkg(self): + check_call([sys.executable, "-m", "flake8", "qemu/"]) + + def test_flake8_scripts(self): + check_call([sys.executable, "-m", "flake8", "scripts/"]) + + def test_flake8_qapi(self): + check_call([sys.executable, "-m", "flake8", + "../scripts/qapi/", + "../docs/sphinx/qapidoc.py", + "../docs/sphinx/qapi_domain.py"]) + + def test_isort_pkg(self): + check_call([sys.executable, "-m", "isort", "-c", "qemu/"]) + + def test_isort_scripts(self): + check_call([sys.executable, "-m", "isort", "-c", "scripts/"]) + + def test_isort_qapi(self): + check_call([sys.executable, "-m", "isort", + "--sp", ".", "-c", "../scripts/qapi/"]) + + def test_isort_qapi_sphinx(self): + # Force isort to recognize 'compat' as a local module and not + # third-party + check_call([sys.executable, "-m", "isort", + "--sp", ".", "-c", "-p", "compat", + "../docs/sphinx/qapi_domain.py", + "../docs/sphinx/qapidoc.py"]) + + def test_mypy_pkg(self): + check_call([sys.executable, "-m", "mypy", "-p", "qemu"]) + + def test_mypy_scripts(self): + check_call([sys.executable, "-m", "mypy", "scripts/"]) + + def test_mypy_qapi(self): + check_call([sys.executable, "-m", "mypy", "../scripts/qapi"]) + + def test_mypy_iotests(self): + check_call([sys.executable, "-m", "linters", "--mypy"], + cwd=3D"../tests/qemu-iotests/") + + # Setuptools v60 introduced the SETUPTOOLS_USE_DISTUTILS=3Dstdlib + # workaround; stdlib distutils was fully removed in Python + # 3.12+. Once we are on >=3D3.12+ exclusively, this workaround can be + # dropped safely. Until then, it is needed for some versions on + # Fedora/Debian distributions which relied upon distro-patched + # setuptools present in CPython, but not within setuptools itself. + + def test_pylint_pkg(self): + os.environ['SETUPTOOLS_USE_DISTUTILS'] =3D 'stdlib' + check_call([sys.executable, "-m", "pylint", "qemu/"]) + + def test_pylint_scripts(self): + os.environ['SETUPTOOLS_USE_DISTUTILS'] =3D 'stdlib' + check_call([sys.executable, "-m", "pylint", "scripts/"]) + + def test_pylint_qapi(self): + os.environ['SETUPTOOLS_USE_DISTUTILS'] =3D 'stdlib' + check_call([sys.executable, "-m", "pylint", + "--rcfile=3D../scripts/qapi/pylintrc", + "../scripts/qapi/", + "../docs/sphinx/qapidoc.py", + "../docs/sphinx/qapi_domain.py"]) + + def test_pylint_iotests(self): + os.environ['SETUPTOOLS_USE_DISTUTILS'] =3D 'stdlib' + check_call([sys.executable, "-m", "linters", "--pylint"], + cwd=3D"../tests/qemu-iotests/") diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index 38b17d17e14..19912027076 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -32,6 +32,7 @@ fusepy=3D=3D2.0.4 =20 # Test-runners, utilities, etc. avocado-framework=3D=3D90.0 +pytest=3D=3D6.0.2 =20 # Linters flake8=3D=3D5.0.4 --=20 2.53.0