From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1636388272; cv=none; d=zohomail.com; s=zohoarc; b=c8raOsVsLSmlfV48Ilxukw86bFow9gzwp42U+ft1rxg+uk8OtQ+boLs7YmcCvwoRT6EKWe+nPY0Tihr70AooUXC06UwX+UKFXqo3CSwhKfDcZs4/Pmj+gPE3nERW2LWzorfDs/CAnYBxorr2ZQ3KTYzNZkVLoftkTZMYzSbxoIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388272; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=GMrdeSiQ+KnelF2GFHW2ZMeVD2G2lXREHtMKu/SnDtA=; b=jZjM30pC5ez8NzKiine2LyBqPSWMGtTc+PrziZ/mdw67rYiQ9UvM4j0IxqGK1eCrYZWmO6clv/pyiCW82cNvoSyxJAkK2bSTgnD1T9mRY2H9c47J/052LM9OJdJtbsaxNpj6Qg85PjFUH0goNhBzXqPGiWU8SkFjx22/B6Q73nU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1636388272092365.1708939766445; Mon, 8 Nov 2021 08:17:52 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-92-BlPiDmHKOzSYVNd8nqUPng-1; Mon, 08 Nov 2021 11:17:49 -0500 Received: by mail-wm1-f72.google.com with SMTP id m18-20020a05600c3b1200b0033283ea5facso41216wms.1 for ; Mon, 08 Nov 2021 08:17:48 -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 k27sm18495352wms.41.2021.11.08.08.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388270; 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=GMrdeSiQ+KnelF2GFHW2ZMeVD2G2lXREHtMKu/SnDtA=; b=LUdXRdVDnRrAcBmqM4snYxwNAgjJWRnHEzaaoQFEggCcVPOdb6cR0M00Rd0+I9Z1P9aQoq KP6pFufzF16L3HoJB7zT9QH8MgOB7y07kZv58c9qndBk9uZ4PSCi1+s65fWLTNr1MO2iqr 27wl56GqKaJWJ0jeNMnZMr0nw9XHGzc= X-MC-Unique: BlPiDmHKOzSYVNd8nqUPng-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=GMrdeSiQ+KnelF2GFHW2ZMeVD2G2lXREHtMKu/SnDtA=; b=z0JB5+S33ZzgilroTevVlTue3/kOKzQeUjf+5QPydaukCJxzWb6Nfyf/I9fD2H1S63 6sAsOi2+H+D+0d62eo+pft8wkfvS+1CVm9vn029o6SE6oR4a1dPN2gZwKDKnVrhFBxGH wnyrhmkFFZHNYaZftgrVPkOT/gC/aH9qLHC6qyHFpd0+OQ7TdIlPu9V3r0Du94n2UWIE ZwyuqA94UFAMzqUcSF7OWS3FU7PNMThSbLuqgGSL1drLLMJ+GL4n6CTgvMzUAuMxpXsY U9RyTwrLkK9jqjQxZtxLxsEMb8GqtDUhMKWUoE80qsvMny4MMsWKt6+A0geG5SX6K+Dv eE7w== X-Gm-Message-State: AOAM531TdFAs7q/lDrQro5Qah0Rz/QB4OaknDlf6c980hULVxFspA5+c 4kID0KIlmXrKo2pHq64WZXvoss+9iSMVDuXgYg8ibdG9zFqmXlrOQFzS8RUwtX+Bnz4cuvk3cB+ W1iOekx5hSeMfmw== X-Received: by 2002:a5d:6ac7:: with SMTP id u7mr369570wrw.57.1636388267821; Mon, 08 Nov 2021 08:17:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvVljzw7CoKR/6g57sl6SdgMoMMrt2eZxDXfOxEgf5BENMlf9CYZKsABjke6mNuASq9QySLA== X-Received: by 2002:a5d:6ac7:: with SMTP id u7mr369539wrw.57.1636388267641; Mon, 08 Nov 2021 08:17:47 -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?= , Thomas Huth Subject: [PULL 1/9] tests/acceptance: introduce new check-avocado target Date: Mon, 8 Nov 2021 17:17:31 +0100 Message-Id: <20211108161739.1371503-2-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: 1636388275570100001 From: Willian Rampazzo This introduces a new `make` target, `check-avocado`, and adds a deprecation message about the `check-acceptance` target. This is a preparation for renaming the `tests/acceptance` folder to `tests/avocado`. The plan is to remove the call to the `check-avocado` target one or two months after the release and leave the warning to force people to move to the new `check-avocado` target. Later, the `check-acceptance` target can be removed. The intent is to avoid a direct impact during the current soft freeze. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Willian Rampazzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Thomas Huth Message-Id: <20211105155354.154864-2-willianr@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/Makefile.include | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 8434a33fe68..8e8ee584933 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -16,7 +16,7 @@ ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" endif - @echo " $(MAKE) check-acceptance Run acceptance (functional) tests fo= r currently configured targets" + @echo " $(MAKE) check-avocado Run avocado (integration) tests for = currently configured targets" @echo @echo " $(MAKE) check-report.tap Generates an aggregated TAP test rep= ort" @echo " $(MAKE) check-venv Creates a Python venv for tests" @@ -24,7 +24,7 @@ endif @echo @echo "The following are useful for CI builds" @echo " $(MAKE) check-build Build most test binaris" - @echo " $(MAKE) get-vm-images Downloads all images used by accepta= nce tests, according to configured targets (~350 MB each, 1.5 GB max)" + @echo " $(MAKE) get-vm-images Downloads all images used by avocado= tests, according to configured targets (~350 MB each, 1.5 GB max)" @echo @echo @echo "The variable SPEED can be set to control the gtester speed setting= ." @@ -83,7 +83,7 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 # Python venv for running tests =20 -.PHONY: check-venv check-acceptance +.PHONY: check-venv check-avocado check-acceptance check-acceptance-depreca= ted-warning =20 TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt @@ -127,12 +127,12 @@ get-vm-image-fedora-31-%: check-venv $(call quiet-command, \ $(TESTS_VENV_DIR)/bin/python -m avocado vmimage get \ --distro=3Dfedora --distro-version=3D31 --arch=3D$*, \ - "AVOCADO", "Downloading acceptance tests VM image for $*") + "AVOCADO", "Downloading avocado tests VM image for $*") =20 # download all vm images, according to defined targets get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%, $(FEDORA_= 31_DOWNLOAD)) =20 -check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images +check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(call quiet-command, \ $(TESTS_VENV_DIR)/bin/python -m avocado \ --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ @@ -142,6 +142,13 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-= vm-images $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ "AVOCADO", "tests/acceptance") =20 +check-acceptance-deprecated-warning: + @echo + @echo "Note '$(MAKE) check-acceptance' is deprecated, use '$(MAKE) check-= avocado' instead." + @echo + +check-acceptance: check-acceptance-deprecated-warning | check-avocado + # Consolidated targets =20 .PHONY: check-block check check-clean get-vm-images --=20 2.31.1 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636388280; cv=none; d=zohomail.com; s=zohoarc; b=PyFONQQfsXjxjX5b0wUHh0c8mu5yTXu5UScisk7oC74CLO2kRsA9Mb5Y5mEqKWCCbpiAVYXGeIDtUhe1ufolwJUpOs1RNmI2lcP1O+uLNFNEik49scRsBcFpzawddAN2VdWcsZJ+zQmMSLhCFjrEc/A+Jd8RnsIqzOlQaRlzXlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388280; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Kv5lznyb62LOl5vTOuB4U+ENLE/IjkpJEOtpAIQE/iI=; b=B3AiuW2c8iZypZ3cyyX5CWruA4kx7Zexzje1xpmoVGk+CVXp5IakNAS4ZYEhxnkt8aNFXiq33j0Oeg2h2qbiKaM65tLji6QP8Tt73YOaIAHF5ijU9ZUMdL4p9bglnz//IPm3mW5TdEKNb6sjPrKgL+q+VOMy0Yk71vOrDicLd9E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636388280546138.37583569977187; Mon, 8 Nov 2021 08:18:00 -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-525-qFvEyE2aNn6a3DMPZk5ZbQ-1; Mon, 08 Nov 2021 11:17:56 -0500 Received: by mail-wr1-f72.google.com with SMTP id q17-20020adfcd91000000b0017bcb12ad4fso4201052wrj.12 for ; Mon, 08 Nov 2021 08:17:56 -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 o9sm17307545wrs.4.2021.11.08.08.17.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:17:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388279; 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=Kv5lznyb62LOl5vTOuB4U+ENLE/IjkpJEOtpAIQE/iI=; b=O1iV//ryNhXkn2ElwpnpthB24pkjawIKWav11VQVLgDx7QxiKWnJSDFTJJky5XeT4gPlbo hlH59ly5zcJ/TK7nXKOfD6A0cHgMiAAMdHry40AUCOSNVqsEjEZu9KoXGIoC7O9j0V1h/m ldcogTFVTIoJeOQRk/P2sjR5BgOwUnQ= X-MC-Unique: qFvEyE2aNn6a3DMPZk5ZbQ-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=Kv5lznyb62LOl5vTOuB4U+ENLE/IjkpJEOtpAIQE/iI=; b=5d0q8s2kzFBPGqn6st5vom3+Wi+w/R6iK6GJowijbHsOk10FEgCWG8j4bpT+G8TSvM WTo4aZlTwrue0RMKuTHSpq8xWC+a+qWJzELnCyOEDpl+nt7mQE0/153gLLYS97V7LtZ8 Q1n/PdFW2Iqd686BVeVMlma7RxsWcydROqjpf3U5knhVFn2HhqblheUS9EoltZQ4UorY hSa4QlAO1ReAcaagW1BtqL/8TVyp1rV4HdTz81Kjv0qD/6N5CmXF3lHXqyqj0KHK4Myv TsiM3ci2iP5jsZ7hkRWBDWK/dTTAeEC8++N0t0TD5fOOssg5h5DnwQsR/xmMEYvW/qPO fqRw== X-Gm-Message-State: AOAM5323tDtmjAi73CZISSdAMzXBMdPlaoZdChy1VzJScr5GgpzenM2h TLv/ROsjd2/jYXTDGKcxZYy0d/Em/YZXh6QxxNjqCsgyDtY8B7w8qxKoZKKzt4dcgIFBypCEic3 4ca910ckcEI/MuA== X-Received: by 2002:a1c:e906:: with SMTP id q6mr54193799wmc.126.1636388273916; Mon, 08 Nov 2021 08:17:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXR+GPucqkVOEFaNFluzFOXYx5wlq26tqY9bK6uzFUyHLcyhBBtWjEBBpOkO/7w8wQTEVsSw== X-Received: by 2002:a1c:e906:: with SMTP id q6mr54193735wmc.126.1636388273399; Mon, 08 Nov 2021 08:17:53 -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 , Niek Linnenbank , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 2/9] tests/acceptance: rename tests acceptance to tests avocado Date: Mon, 8 Nov 2021 17:17:32 +0100 Message-Id: <20211108161739.1371503-3-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: 1636388281415100001 From: Willian Rampazzo In the discussion about renaming the `tests/acceptance` [1], the conclusion was that the folders inside `tests` are related to the framework running the tests and not directly related to the type of the tests. This changes the folder to `tests/avocado` and adjusts the MAKEFILE, the CI related files and the documentation. [1] https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg06553.html Reviewed-by: Niek Linnenbank Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Willian Rampazzo Message-Id: <20211105155354.154864-3-willianr@redhat.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/devel/build-system.rst | 2 +- docs/devel/ci-definitions.rst.inc | 2 +- docs/devel/testing.rst | 49 ++++++++-------- docs/system/arm/orangepi.rst | 8 +-- python/qemu/machine/README.rst | 2 +- python/qemu/qmp/README.rst | 2 +- python/qemu/utils/README.rst | 2 +- tests/acceptance/README.rst | 10 ---- tests/avocado/README.rst | 10 ++++ configure | 2 +- .gitlab-ci.d/buildtest-template.yml | 2 +- .gitlab-ci.d/buildtest.yml | 56 +++++++++---------- MAINTAINERS | 52 ++++++++--------- tests/Makefile.include | 4 +- .../avocado_qemu/__init__.py | 2 +- tests/{acceptance =3D> avocado}/boot_linux.py | 0 .../boot_linux_console.py | 0 tests/{acceptance =3D> avocado}/boot_xen.py | 0 tests/{acceptance =3D> avocado}/cpu_queries.py | 0 .../empty_cpu_model.py | 0 tests/{acceptance =3D> avocado}/hotplug_cpu.py | 0 tests/{acceptance =3D> avocado}/info_usernet.py | 0 tests/{acceptance =3D> avocado}/intel_iommu.py | 0 tests/{acceptance =3D> avocado}/linux_initrd.py | 2 +- .../linux_ssh_mips_malta.py | 0 .../machine_arm_canona1100.py | 0 .../machine_arm_integratorcp.py | 0 .../machine_arm_n8x0.py | 0 tests/{acceptance =3D> avocado}/machine_avr6.py | 2 +- .../machine_m68k_nextcube.py | 0 .../machine_microblaze.py | 0 .../machine_mips_fuloong2e.py | 0 .../machine_mips_loongson3v.py | 0 .../machine_mips_malta.py | 0 .../machine_rx_gdbsim.py | 0 .../machine_s390_ccw_virtio.py | 0 .../machine_sparc64_sun4u.py | 0 .../machine_sparc_leon3.py | 0 tests/{acceptance =3D> avocado}/migration.py | 0 tests/{acceptance =3D> avocado}/multiprocess.py | 0 .../pc_cpu_hotplug_props.py | 0 tests/{acceptance =3D> avocado}/ppc_405.py | 0 tests/{acceptance =3D> avocado}/ppc_bamboo.py | 0 .../{acceptance =3D> avocado}/ppc_mpc8544ds.py | 0 tests/{acceptance =3D> avocado}/ppc_prep_40p.py | 0 tests/{acceptance =3D> avocado}/ppc_pseries.py | 0 .../ppc_virtex_ml507.py | 0 .../{acceptance =3D> avocado}/replay_kernel.py | 0 tests/{acceptance =3D> avocado}/replay_linux.py | 0 .../reverse_debugging.py | 0 tests/{acceptance =3D> avocado}/smmu.py | 0 tests/{acceptance =3D> avocado}/tcg_plugins.py | 0 .../tesseract_utils.py | 0 tests/{acceptance =3D> avocado}/version.py | 0 tests/{acceptance =3D> avocado}/virtio-gpu.py | 0 .../virtio_check_params.py | 0 .../{acceptance =3D> avocado}/virtio_version.py | 0 .../virtiofs_submounts.py | 0 .../virtiofs_submounts.py.data/cleanup.sh | 0 .../guest-cleanup.sh | 0 .../virtiofs_submounts.py.data/guest.sh | 0 .../virtiofs_submounts.py.data/host.sh | 0 tests/{acceptance =3D> avocado}/vnc.py | 0 .../x86_cpu_model_versions.py | 0 64 files changed, 104 insertions(+), 105 deletions(-) delete mode 100644 tests/acceptance/README.rst create mode 100644 tests/avocado/README.rst rename tests/{acceptance =3D> avocado}/avocado_qemu/__init__.py (99%) rename tests/{acceptance =3D> avocado}/boot_linux.py (100%) rename tests/{acceptance =3D> avocado}/boot_linux_console.py (100%) rename tests/{acceptance =3D> avocado}/boot_xen.py (100%) rename tests/{acceptance =3D> avocado}/cpu_queries.py (100%) rename tests/{acceptance =3D> avocado}/empty_cpu_model.py (100%) rename tests/{acceptance =3D> avocado}/hotplug_cpu.py (100%) rename tests/{acceptance =3D> avocado}/info_usernet.py (100%) rename tests/{acceptance =3D> avocado}/intel_iommu.py (100%) rename tests/{acceptance =3D> avocado}/linux_initrd.py (99%) rename tests/{acceptance =3D> avocado}/linux_ssh_mips_malta.py (100%) rename tests/{acceptance =3D> avocado}/machine_arm_canona1100.py (100%) rename tests/{acceptance =3D> avocado}/machine_arm_integratorcp.py (100%) rename tests/{acceptance =3D> avocado}/machine_arm_n8x0.py (100%) rename tests/{acceptance =3D> avocado}/machine_avr6.py (98%) rename tests/{acceptance =3D> avocado}/machine_m68k_nextcube.py (100%) rename tests/{acceptance =3D> avocado}/machine_microblaze.py (100%) rename tests/{acceptance =3D> avocado}/machine_mips_fuloong2e.py (100%) rename tests/{acceptance =3D> avocado}/machine_mips_loongson3v.py (100%) rename tests/{acceptance =3D> avocado}/machine_mips_malta.py (100%) rename tests/{acceptance =3D> avocado}/machine_rx_gdbsim.py (100%) rename tests/{acceptance =3D> avocado}/machine_s390_ccw_virtio.py (100%) rename tests/{acceptance =3D> avocado}/machine_sparc64_sun4u.py (100%) rename tests/{acceptance =3D> avocado}/machine_sparc_leon3.py (100%) rename tests/{acceptance =3D> avocado}/migration.py (100%) rename tests/{acceptance =3D> avocado}/multiprocess.py (100%) rename tests/{acceptance =3D> avocado}/pc_cpu_hotplug_props.py (100%) rename tests/{acceptance =3D> avocado}/ppc_405.py (100%) rename tests/{acceptance =3D> avocado}/ppc_bamboo.py (100%) rename tests/{acceptance =3D> avocado}/ppc_mpc8544ds.py (100%) rename tests/{acceptance =3D> avocado}/ppc_prep_40p.py (100%) rename tests/{acceptance =3D> avocado}/ppc_pseries.py (100%) rename tests/{acceptance =3D> avocado}/ppc_virtex_ml507.py (100%) rename tests/{acceptance =3D> avocado}/replay_kernel.py (100%) rename tests/{acceptance =3D> avocado}/replay_linux.py (100%) rename tests/{acceptance =3D> avocado}/reverse_debugging.py (100%) rename tests/{acceptance =3D> avocado}/smmu.py (100%) rename tests/{acceptance =3D> avocado}/tcg_plugins.py (100%) rename tests/{acceptance =3D> avocado}/tesseract_utils.py (100%) rename tests/{acceptance =3D> avocado}/version.py (100%) rename tests/{acceptance =3D> avocado}/virtio-gpu.py (100%) rename tests/{acceptance =3D> avocado}/virtio_check_params.py (100%) rename tests/{acceptance =3D> avocado}/virtio_version.py (100%) rename tests/{acceptance =3D> avocado}/virtiofs_submounts.py (100%) rename tests/{acceptance =3D> avocado}/virtiofs_submounts.py.data/cleanup.= sh (100%) rename tests/{acceptance =3D> avocado}/virtiofs_submounts.py.data/guest-cl= eanup.sh (100%) rename tests/{acceptance =3D> avocado}/virtiofs_submounts.py.data/guest.sh= (100%) rename tests/{acceptance =3D> avocado}/virtiofs_submounts.py.data/host.sh = (100%) rename tests/{acceptance =3D> avocado}/vnc.py (100%) rename tests/{acceptance =3D> avocado}/x86_cpu_model_versions.py (100%) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index ae536ef75db..aca1f5a273f 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -416,7 +416,7 @@ number of dynamically created files listed later. =20 ``tests/Makefile.include`` Rules for external test harnesses. These include the TCG tests, - ``qemu-iotests`` and the Avocado-based acceptance tests. + ``qemu-iotests`` and the Avocado-based integration tests. =20 ``tests/docker/Makefile.include`` Rules for Docker tests. Like tests/Makefile, this file is included diff --git a/docs/devel/ci-definitions.rst.inc b/docs/devel/ci-definitions.= rst.inc index 32e22ff4687..6d5c6fd9f20 100644 --- a/docs/devel/ci-definitions.rst.inc +++ b/docs/devel/ci-definitions.rst.inc @@ -59,7 +59,7 @@ to system testing [5]_. Note that, in some cases, system = testing may require interaction with third-party software, like operating system images, datab= ases, networks, and so on. =20 -On QEMU, system testing is represented by the 'check-acceptance' target fr= om +On QEMU, system testing is represented by the 'check-avocado' target from 'make'. =20 Flaky tests diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 7500f076c21..dc5dbd057db 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -653,17 +653,16 @@ supported. To start the fuzzer, run Alternatively, some command different from "qemu-img info" can be tested, = by changing the ``-c`` option. =20 -Acceptance tests using the Avocado Framework --------------------------------------------- +Integration tests using the Avocado Framework +--------------------------------------------- =20 -The ``tests/acceptance`` directory hosts functional tests, also known -as acceptance level tests. They're usually higher level tests, and -may interact with external resources and with various guest operating -systems. +The ``tests/avocado`` directory hosts integration tests. They're usually +higher level tests, and may interact with external resources and with +various guest operating systems. =20 These tests are written using the Avocado Testing Framework (which must be installed separately) in conjunction with a the ``avocado_qemu.Test`` -class, implemented at ``tests/acceptance/avocado_qemu``. +class, implemented at ``tests/avocado/avocado_qemu``. =20 Tests based on ``avocado_qemu.Test`` can easily: =20 @@ -695,11 +694,11 @@ Tests based on ``avocado_qemu.Test`` can easily: Running tests ~~~~~~~~~~~~~ =20 -You can run the acceptance tests simply by executing: +You can run the avocado tests simply by executing: =20 .. code:: =20 - make check-acceptance + make check-avocado =20 This involves the automatic creation of Python virtual environment within the build tree (at ``tests/venv``) which will have all the @@ -714,12 +713,12 @@ specific version, they may be on packages named ``pyt= hon3-venv`` and ``python3-pip``. =20 It is also possible to run tests based on tags using the -``make check-acceptance`` command and the ``AVOCADO_TAGS`` environment +``make check-avocado`` command and the ``AVOCADO_TAGS`` environment variable: =20 .. code:: =20 - make check-acceptance AVOCADO_TAGS=3Dquick + make check-avocado AVOCADO_TAGS=3Dquick =20 Note that tags separated with commas have an AND behavior, while tags separated by spaces have an OR behavior. For more information on Avocado @@ -728,31 +727,31 @@ tags, see: https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/t= ags.html =20 To run a single test file, a couple of them, or a test within a file -using the ``make check-acceptance`` command, set the ``AVOCADO_TESTS`` +using the ``make check-avocado`` command, set the ``AVOCADO_TESTS`` environment variable with the test files or test names. To run all tests from a single file, use: =20 .. code:: =20 - make check-acceptance AVOCADO_TESTS=3D$FILEPATH + make check-avocado AVOCADO_TESTS=3D$FILEPATH =20 The same is valid to run tests from multiple test files: =20 .. code:: =20 - make check-acceptance AVOCADO_TESTS=3D'$FILEPATH1 $FILEPATH2' + make check-avocado AVOCADO_TESTS=3D'$FILEPATH1 $FILEPATH2' =20 To run a single test within a file, use: =20 .. code:: =20 - make check-acceptance AVOCADO_TESTS=3D$FILEPATH:$TESTCLASS.$TESTNAME + make check-avocado AVOCADO_TESTS=3D$FILEPATH:$TESTCLASS.$TESTNAME =20 The same is valid to run single tests from multiple test files: =20 .. code:: =20 - make check-acceptance AVOCADO_TESTS=3D'$FILEPATH1:$TESTCLASS1.$TESTNAME1= $FILEPATH2:$TESTCLASS2.$TESTNAME2' + make check-avocado AVOCADO_TESTS=3D'$FILEPATH1:$TESTCLASS1.$TESTNAME1 $F= ILEPATH2:$TESTCLASS2.$TESTNAME2' =20 The scripts installed inside the virtual environment may be used without an "activation". For instance, the Avocado test runner @@ -760,9 +759,9 @@ may be invoked by running: =20 .. code:: =20 - tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/acceptance/ + tests/venv/bin/avocado run $OPTION1 $OPTION2 tests/avocado/ =20 -Note that if ``make check-acceptance`` was not executed before, it is +Note that if ``make check-avocado`` was not executed before, it is possible to create the Python virtual environment with the dependencies needed running: =20 @@ -775,20 +774,20 @@ a test file. To run tests from a single file within t= he build tree, use: =20 .. code:: =20 - tests/venv/bin/avocado run tests/acceptance/$TESTFILE + tests/venv/bin/avocado run tests/avocado/$TESTFILE =20 To run a single test within a test file, use: =20 .. code:: =20 - tests/venv/bin/avocado run tests/acceptance/$TESTFILE:$TESTCLASS.$TESTNA= ME + tests/venv/bin/avocado run tests/avocado/$TESTFILE:$TESTCLASS.$TESTNAME =20 Valid test names are visible in the output from any previous execution -of Avocado or ``make check-acceptance``, and can also be queried using: +of Avocado or ``make check-avocado``, and can also be queried using: =20 .. code:: =20 - tests/venv/bin/avocado list tests/acceptance + tests/venv/bin/avocado list tests/avocado =20 Manual Installation ~~~~~~~~~~~~~~~~~~~ @@ -806,7 +805,7 @@ Alternatively, follow the instructions on this link: Overview ~~~~~~~~ =20 -The ``tests/acceptance/avocado_qemu`` directory provides the +The ``tests/avocado/avocado_qemu`` directory provides the ``avocado_qemu`` Python module, containing the ``avocado_qemu.Test`` class. Here's a simple usage example: =20 @@ -913,7 +912,7 @@ like this: self.ssh_command('some_command_to_be_run_in_the_guest') =20 Please refer to tests that use ``avocado_qemu.LinuxTest`` under -``tests/acceptance`` for more examples. +``tests/avocado`` for more examples. =20 QEMUMachine ~~~~~~~~~~~ @@ -1204,7 +1203,7 @@ And remove any package you want with:: =20 pip uninstall =20 -If you've used ``make check-acceptance``, the Python virtual environment w= here +If you've used ``make check-avocado``, the Python virtual environment where Avocado is installed will be cleaned up as part of ``make check-clean``. =20 .. _checktcg-ref: diff --git a/docs/system/arm/orangepi.rst b/docs/system/arm/orangepi.rst index 6f23907fb69..c55694dd91b 100644 --- a/docs/system/arm/orangepi.rst +++ b/docs/system/arm/orangepi.rst @@ -250,14 +250,14 @@ and set the following environment variables before bo= oting: Optionally you may save the environment variables to SD card with 'saveenv= '. To continue booting simply give the 'boot' command and NetBSD boots. =20 -Orange Pi PC acceptance tests -""""""""""""""""""""""""""""" +Orange Pi PC integration tests +"""""""""""""""""""""""""""""" =20 -The Orange Pi PC machine has several acceptance tests included. +The Orange Pi PC machine has several integration tests included. To run the whole set of tests, build QEMU from source and simply provide the following command: =20 .. code-block:: bash =20 $ AVOCADO_ALLOW_LARGE_STORAGE=3Dyes avocado --show=3Dapp,console run \ - -t machine:orangepi-pc tests/acceptance/boot_linux_console.py + -t machine:orangepi-pc tests/avocado/boot_linux_console.py diff --git a/python/qemu/machine/README.rst b/python/qemu/machine/README.rst index ac2b4fffb42..8de2c3d7722 100644 --- a/python/qemu/machine/README.rst +++ b/python/qemu/machine/README.rst @@ -2,7 +2,7 @@ qemu.machine package =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 This package provides core utilities used for testing and debugging -QEMU. It is used by the iotests, vm tests, acceptance tests, and several +QEMU. It is used by the iotests, vm tests, avocado tests, and several other utilities in the ./scripts directory. It is not a fully-fledged SDK and it is subject to change at any time. =20 diff --git a/python/qemu/qmp/README.rst b/python/qemu/qmp/README.rst index c21951491cf..5bfb82535f8 100644 --- a/python/qemu/qmp/README.rst +++ b/python/qemu/qmp/README.rst @@ -3,7 +3,7 @@ qemu.qmp package =20 This package provides a library used for connecting to and communicating with QMP servers. It is used extensively by iotests, vm tests, -acceptance tests, and other utilities in the ./scripts directory. It is +avocado tests, and other utilities in the ./scripts directory. It is not a fully-fledged SDK and is subject to change at any time. =20 See the documentation in ``__init__.py`` for more information. diff --git a/python/qemu/utils/README.rst b/python/qemu/utils/README.rst index 975fbf4d7de..d5f2da14540 100644 --- a/python/qemu/utils/README.rst +++ b/python/qemu/utils/README.rst @@ -2,6 +2,6 @@ qemu.utils package =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 This package provides miscellaneous utilities used for testing and -debugging QEMU. It is used primarily by the vm and acceptance tests. +debugging QEMU. It is used primarily by the vm and avocado tests. =20 See the documentation in ``__init__.py`` for more information. diff --git a/tests/acceptance/README.rst b/tests/acceptance/README.rst deleted file mode 100644 index 89260faed6b..00000000000 --- a/tests/acceptance/README.rst +++ /dev/null @@ -1,10 +0,0 @@ -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -Acceptance tests using the Avocado Framework -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -This directory contains functional tests, also known as acceptance -level tests. They're usually higher level, and may interact with -external resources and with various guest operating systems. - -For more information, please refer to ``docs/devel/testing.rst``, -section "Acceptance tests using the Avocado Framework". diff --git a/tests/avocado/README.rst b/tests/avocado/README.rst new file mode 100644 index 00000000000..94488371bbe --- /dev/null +++ b/tests/avocado/README.rst @@ -0,0 +1,10 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Integration tests using the Avocado Framework +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This directory contains integration tests. They're usually higher +level, and may interact with external resources and with various +guest operating systems. + +For more information, please refer to ``docs/devel/testing.rst``, +section "Integration tests using the Avocado Framework". diff --git a/configure b/configure index 33682cb9716..19d5e97b278 100755 --- a/configure +++ b/configure @@ -3832,7 +3832,7 @@ LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" LINKS=3D"$LINKS roms/seabios/Makefile" LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit -LINKS=3D"$LINKS tests/acceptance tests/data" +LINKS=3D"$LINKS tests/avocado tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" LINKS=3D"$LINKS python" LINKS=3D"$LINKS contrib/plugins/Makefile " diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-t= emplate.yml index fcbcc4e627a..2c7980a4f6a 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -37,7 +37,7 @@ # Avoid recompiling by hiding ninja with NINJA=3D":" - make NINJA=3D":" $MAKE_CHECK_ARGS =20 -.acceptance_test_job_template: +.avocado_test_job_template: extends: .native_test_job_template cache: key: "${CI_JOB_NAME}-cache" diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 6c1301e9128..71d0f407add 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -26,14 +26,14 @@ check-system-alpine: IMAGE: alpine MAKE_CHECK_ARGS: check =20 -acceptance-system-alpine: - extends: .acceptance_test_job_template +avocado-system-alpine: + extends: .avocado_test_job_template needs: - job: build-system-alpine artifacts: true variables: IMAGE: alpine - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-system-ubuntu: extends: .native_build_job_template @@ -59,14 +59,14 @@ check-system-ubuntu: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check =20 -acceptance-system-ubuntu: - extends: .acceptance_test_job_template +avocado-system-ubuntu: + extends: .avocado_test_job_template needs: - job: build-system-ubuntu artifacts: true variables: IMAGE: ubuntu2004 - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-system-debian: extends: .native_build_job_template @@ -91,14 +91,14 @@ check-system-debian: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check =20 -acceptance-system-debian: - extends: .acceptance_test_job_template +avocado-system-debian: + extends: .avocado_test_job_template needs: - job: build-system-debian artifacts: true variables: IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-system-fedora: extends: .native_build_job_template @@ -125,14 +125,14 @@ check-system-fedora: IMAGE: fedora MAKE_CHECK_ARGS: check =20 -acceptance-system-fedora: - extends: .acceptance_test_job_template +avocado-system-fedora: + extends: .avocado_test_job_template needs: - job: build-system-fedora artifacts: true variables: IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-system-centos: extends: .native_build_job_template @@ -159,14 +159,14 @@ check-system-centos: IMAGE: centos8 MAKE_CHECK_ARGS: check =20 -acceptance-system-centos: - extends: .acceptance_test_job_template +avocado-system-centos: + extends: .avocado_test_job_template needs: - job: build-system-centos artifacts: true variables: IMAGE: centos8 - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-system-opensuse: extends: .native_build_job_template @@ -191,14 +191,14 @@ check-system-opensuse: IMAGE: opensuse-leap MAKE_CHECK_ARGS: check =20 -acceptance-system-opensuse: - extends: .acceptance_test_job_template +avocado-system-opensuse: + extends: .avocado_test_job_template needs: - job: build-system-opensuse artifacts: true variables: IMAGE: opensuse-leap - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 =20 # This jobs explicitly disable TCG (--disable-tcg), KVM is detected by @@ -317,7 +317,7 @@ clang-user: # This can be accomplished by using -enable-slirp=3Dgit, which avoids the = use of # a system-wide version of the library # -# Split in three sets of build/check/acceptance to limit the execution tim= e of each +# Split in three sets of build/check/avocado to limit the execution time o= f each # job build-cfi-aarch64: extends: .native_build_job_template @@ -352,14 +352,14 @@ check-cfi-aarch64: IMAGE: fedora MAKE_CHECK_ARGS: check =20 -acceptance-cfi-aarch64: - extends: .acceptance_test_job_template +avocado-cfi-aarch64: + extends: .avocado_test_job_template needs: - job: build-cfi-aarch64 artifacts: true variables: IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-cfi-ppc64-s390x: extends: .native_build_job_template @@ -394,14 +394,14 @@ check-cfi-ppc64-s390x: IMAGE: fedora MAKE_CHECK_ARGS: check =20 -acceptance-cfi-ppc64-s390x: - extends: .acceptance_test_job_template +avocado-cfi-ppc64-s390x: + extends: .avocado_test_job_template needs: - job: build-cfi-ppc64-s390x artifacts: true variables: IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 build-cfi-x86_64: extends: .native_build_job_template @@ -430,14 +430,14 @@ check-cfi-x86_64: IMAGE: fedora MAKE_CHECK_ARGS: check =20 -acceptance-cfi-x86_64: - extends: .acceptance_test_job_template +avocado-cfi-x86_64: + extends: .avocado_test_job_template needs: - job: build-cfi-x86_64 artifacts: true variables: IMAGE: fedora - MAKE_CHECK_ARGS: check-acceptance + MAKE_CHECK_ARGS: check-avocado =20 tsan-build: extends: .native_build_job_template diff --git a/MAINTAINERS b/MAINTAINERS index 797be5b3665..53b63df407a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -177,7 +177,7 @@ L: qemu-arm@nongnu.org S: Maintained F: hw/arm/smmu* F: include/hw/arm/smmu* -F: tests/acceptance/smmu.py +F: tests/avocado/smmu.py =20 AVR TCG CPUs M: Michael Rolnik @@ -185,7 +185,7 @@ S: Maintained F: docs/system/target-avr.rst F: gdb-xml/avr-cpu.xml F: target/avr/ -F: tests/acceptance/machine_avr6.py +F: tests/avocado/machine_avr6.py =20 CRIS TCG CPUs M: Edgar E. Iglesias @@ -657,7 +657,7 @@ S: Odd Fixes F: include/hw/arm/digic.h F: hw/*/digic* F: include/hw/*/digic* -F: tests/acceptance/machine_arm_canona1100.py +F: tests/avocado/machine_arm_canona1100.py F: docs/system/arm/digic.rst =20 Goldfish RTC @@ -708,7 +708,7 @@ S: Maintained F: hw/arm/integratorcp.c F: hw/misc/arm_integrator_debug.c F: include/hw/misc/arm_integrator_debug.h -F: tests/acceptance/machine_arm_integratorcp.py +F: tests/avocado/machine_arm_integratorcp.py F: docs/system/arm/integratorcp.rst =20 MCIMX6UL EVK / i.MX6ul @@ -805,7 +805,7 @@ F: include/hw/display/blizzard.h F: include/hw/input/lm832x.h F: include/hw/input/tsc2xxx.h F: include/hw/misc/cbus.h -F: tests/acceptance/machine_arm_n8x0.py +F: tests/avocado/machine_arm_n8x0.py F: docs/system/arm/nseries.rst =20 Palm @@ -1159,7 +1159,7 @@ M: Edgar E. Iglesias S: Maintained F: hw/microblaze/petalogix_s3adsp1800_mmu.c F: include/hw/char/xilinx_uartlite.h -F: tests/acceptance/machine_microblaze.py +F: tests/avocado/machine_microblaze.py =20 petalogix_ml605 M: Edgar E. Iglesias @@ -1192,8 +1192,8 @@ F: hw/acpi/piix4.c F: hw/mips/malta.c F: hw/mips/gt64xxx_pci.c F: include/hw/southbridge/piix.h -F: tests/acceptance/linux_ssh_mips_malta.py -F: tests/acceptance/machine_mips_malta.py +F: tests/avocado/linux_ssh_mips_malta.py +F: tests/avocado/machine_mips_malta.py =20 Mipssim R: Aleksandar Rikalo @@ -1211,7 +1211,7 @@ F: hw/isa/vt82c686.c F: hw/pci-host/bonito.c F: hw/usb/vt82c686-uhci-pci.c F: include/hw/isa/vt82c686.h -F: tests/acceptance/machine_mips_fuloong2e.py +F: tests/avocado/machine_mips_fuloong2e.py =20 Loongson-3 virtual platforms M: Huacai Chen @@ -1221,7 +1221,7 @@ F: hw/intc/loongson_liointc.c F: hw/mips/loongson3_bootp.c F: hw/mips/loongson3_bootp.h F: hw/mips/loongson3_virt.c -F: tests/acceptance/machine_mips_loongson3v.py +F: tests/avocado/machine_mips_loongson3v.py =20 Boston M: Paul Burton @@ -1250,7 +1250,7 @@ Bamboo L: qemu-ppc@nongnu.org S: Orphan F: hw/ppc/ppc440_bamboo.c -F: tests/acceptance/ppc_bamboo.py +F: tests/avocado/ppc_bamboo.py =20 e500 L: qemu-ppc@nongnu.org @@ -1271,7 +1271,7 @@ L: qemu-ppc@nongnu.org S: Orphan F: hw/ppc/mpc8544ds.c F: hw/ppc/mpc8544_guts.c -F: tests/acceptance/ppc_mpc8544ds.py +F: tests/avocado/ppc_mpc8544ds.py =20 New World (mac99) M: Mark Cave-Ayland @@ -1318,7 +1318,7 @@ F: hw/dma/i82374.c F: hw/rtc/m48t59-isa.c F: include/hw/isa/pc87312.h F: include/hw/rtc/m48t59.h -F: tests/acceptance/ppc_prep_40p.py +F: tests/avocado/ppc_prep_40p.py =20 sPAPR M: David Gibson @@ -1336,7 +1336,7 @@ F: tests/qtest/spapr* F: tests/qtest/libqos/*spapr* F: tests/qtest/rtas* F: tests/qtest/libqos/rtas* -F: tests/acceptance/ppc_pseries.py +F: tests/avocado/ppc_pseries.py =20 PowerNV (Non-Virtualized) M: C=C3=A9dric Le Goater @@ -1356,7 +1356,7 @@ M: Edgar E. Iglesias L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/virtex_ml507.c -F: tests/acceptance/ppc_virtex_ml507.py +F: tests/avocado/ppc_virtex_ml507.py =20 sam460ex M: BALATON Zoltan @@ -1443,7 +1443,7 @@ R: Yoshinori Sato S: Orphan F: docs/system/target-rx.rst F: hw/rx/rx-gdbsim.c -F: tests/acceptance/machine_rx_gdbsim.py +F: tests/avocado/machine_rx_gdbsim.py =20 SH4 Machines ------------ @@ -1497,7 +1497,7 @@ F: include/hw/pci-host/sabre.h F: hw/pci-bridge/simba.c F: include/hw/pci-bridge/simba.h F: pc-bios/openbios-sparc64 -F: tests/acceptance/machine_sparc64_sun4u.py +F: tests/avocado/machine_sparc64_sun4u.py =20 Sun4v M: Artyom Tarasenko @@ -1513,7 +1513,7 @@ S: Maintained F: hw/sparc/leon3.c F: hw/*/grlib* F: include/hw/*/grlib* -F: tests/acceptance/machine_sparc_leon3.py +F: tests/avocado/machine_sparc_leon3.py =20 S390 Machines ------------- @@ -1528,7 +1528,7 @@ F: include/hw/s390x/ F: hw/watchdog/wdt_diag288.c F: include/hw/watchdog/wdt_diag288.h F: configs/devices/s390x-softmmu/default.mak -F: tests/acceptance/machine_s390_ccw_virtio.py +F: tests/avocado/machine_s390_ccw_virtio.py T: git https://github.com/borntraeger/qemu.git s390-next L: qemu-s390x@nongnu.org =20 @@ -2112,7 +2112,7 @@ M: Alex Benn=C3=A9e S: Maintained F: hw/core/guest-loader.c F: docs/system/guest-loader.rst -F: tests/acceptance/boot_xen.py +F: tests/avocado/boot_xen.py =20 Intel Hexadecimal Object File Loader M: Su Hang @@ -2986,9 +2986,9 @@ F: net/filter-replay.c F: include/sysemu/replay.h F: docs/replay.txt F: stubs/replay.c -F: tests/acceptance/replay_kernel.py -F: tests/acceptance/replay_linux.py -F: tests/acceptance/reverse_debugging.py +F: tests/avocado/replay_kernel.py +F: tests/avocado/replay_linux.py +F: tests/avocado/reverse_debugging.py F: qapi/replay.json =20 IOVA Tree @@ -3105,7 +3105,7 @@ S: Maintained F: docs/devel/tcg-plugins.rst F: plugins/ F: tests/plugin/ -F: tests/acceptance/tcg_plugins.py +F: tests/avocado/tcg_plugins.py F: contrib/plugins/ =20 AArch64 TCG target @@ -3494,14 +3494,14 @@ S: Maintained F: tests/tcg/Makefile F: tests/tcg/Makefile.include =20 -Acceptance (Integration) Testing with the Avocado framework +Integration Testing with the Avocado framework W: https://trello.com/b/6Qi1pxVn/avocado-qemu R: Cleber Rosa R: Philippe Mathieu-Daud=C3=A9 R: Wainer dos Santos Moschetta R: Willian Rampazzo S: Odd Fixes -F: tests/acceptance/ +F: tests/avocado/ =20 Documentation ------------- diff --git a/tests/Makefile.include b/tests/Makefile.include index 8e8ee584933..4c564cf7899 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -89,7 +89,7 @@ TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results ifndef AVOCADO_TESTS - AVOCADO_TESTS=3Dtests/acceptance + AVOCADO_TESTS=3Dtests/avocado endif # Controls the output generated by Avocado when running tests. # Any number of command separated loggers are accepted. For more @@ -140,7 +140,7 @@ check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-i= mages --filter-by-tags-include-empty-key) \ $(AVOCADO_CMDLINE_TAGS) \ $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \ - "AVOCADO", "tests/acceptance") + "AVOCADO", "tests/avocado") =20 check-acceptance-deprecated-warning: @echo diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/avocado/avoc= ado_qemu/__init__.py similarity index 99% rename from tests/acceptance/avocado_qemu/__init__.py rename to tests/avocado/avocado_qemu/__init__.py index 1841053e2c1..cd21b59e040 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -27,7 +27,7 @@ BUILD_DIR =3D os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirn= ame(__file__)))) =20 if os.path.islink(os.path.dirname(os.path.dirname(__file__))): - # The link to the acceptance tests dir in the source code directory + # The link to the avocado tests dir in the source code directory lnk =3D os.path.dirname(os.path.dirname(__file__)) #: The QEMU root source directory SOURCE_DIR =3D os.path.dirname(os.path.dirname(os.readlink(lnk))) diff --git a/tests/acceptance/boot_linux.py b/tests/avocado/boot_linux.py similarity index 100% rename from tests/acceptance/boot_linux.py rename to tests/avocado/boot_linux.py diff --git a/tests/acceptance/boot_linux_console.py b/tests/avocado/boot_li= nux_console.py similarity index 100% rename from tests/acceptance/boot_linux_console.py rename to tests/avocado/boot_linux_console.py diff --git a/tests/acceptance/boot_xen.py b/tests/avocado/boot_xen.py similarity index 100% rename from tests/acceptance/boot_xen.py rename to tests/avocado/boot_xen.py diff --git a/tests/acceptance/cpu_queries.py b/tests/avocado/cpu_queries.py similarity index 100% rename from tests/acceptance/cpu_queries.py rename to tests/avocado/cpu_queries.py diff --git a/tests/acceptance/empty_cpu_model.py b/tests/avocado/empty_cpu_= model.py similarity index 100% rename from tests/acceptance/empty_cpu_model.py rename to tests/avocado/empty_cpu_model.py diff --git a/tests/acceptance/hotplug_cpu.py b/tests/avocado/hotplug_cpu.py similarity index 100% rename from tests/acceptance/hotplug_cpu.py rename to tests/avocado/hotplug_cpu.py diff --git a/tests/acceptance/info_usernet.py b/tests/avocado/info_usernet.= py similarity index 100% rename from tests/acceptance/info_usernet.py rename to tests/avocado/info_usernet.py diff --git a/tests/acceptance/intel_iommu.py b/tests/avocado/intel_iommu.py similarity index 100% rename from tests/acceptance/intel_iommu.py rename to tests/avocado/intel_iommu.py diff --git a/tests/acceptance/linux_initrd.py b/tests/avocado/linux_initrd.= py similarity index 99% rename from tests/acceptance/linux_initrd.py rename to tests/avocado/linux_initrd.py index a249e2f14a2..9b4880cd8c2 100644 --- a/tests/acceptance/linux_initrd.py +++ b/tests/avocado/linux_initrd.py @@ -1,4 +1,4 @@ -# Linux initrd acceptance test. +# Linux initrd integration test. # # Copyright (c) 2018 Red Hat, Inc. # diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/avocado/linux= _ssh_mips_malta.py similarity index 100% rename from tests/acceptance/linux_ssh_mips_malta.py rename to tests/avocado/linux_ssh_mips_malta.py diff --git a/tests/acceptance/machine_arm_canona1100.py b/tests/avocado/mac= hine_arm_canona1100.py similarity index 100% rename from tests/acceptance/machine_arm_canona1100.py rename to tests/avocado/machine_arm_canona1100.py diff --git a/tests/acceptance/machine_arm_integratorcp.py b/tests/avocado/m= achine_arm_integratorcp.py similarity index 100% rename from tests/acceptance/machine_arm_integratorcp.py rename to tests/avocado/machine_arm_integratorcp.py diff --git a/tests/acceptance/machine_arm_n8x0.py b/tests/avocado/machine_a= rm_n8x0.py similarity index 100% rename from tests/acceptance/machine_arm_n8x0.py rename to tests/avocado/machine_arm_n8x0.py diff --git a/tests/acceptance/machine_avr6.py b/tests/avocado/machine_avr6.= py similarity index 98% rename from tests/acceptance/machine_avr6.py rename to tests/avocado/machine_avr6.py index 6baf4e9c7f3..6bab31342aa 100644 --- a/tests/acceptance/machine_avr6.py +++ b/tests/avocado/machine_avr6.py @@ -1,5 +1,5 @@ # -# QEMU AVR acceptance tests +# QEMU AVR integration tests # # Copyright (c) 2019-2020 Michael Rolnik # diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/avocado/mach= ine_m68k_nextcube.py similarity index 100% rename from tests/acceptance/machine_m68k_nextcube.py rename to tests/avocado/machine_m68k_nextcube.py diff --git a/tests/acceptance/machine_microblaze.py b/tests/avocado/machine= _microblaze.py similarity index 100% rename from tests/acceptance/machine_microblaze.py rename to tests/avocado/machine_microblaze.py diff --git a/tests/acceptance/machine_mips_fuloong2e.py b/tests/avocado/mac= hine_mips_fuloong2e.py similarity index 100% rename from tests/acceptance/machine_mips_fuloong2e.py rename to tests/avocado/machine_mips_fuloong2e.py diff --git a/tests/acceptance/machine_mips_loongson3v.py b/tests/avocado/ma= chine_mips_loongson3v.py similarity index 100% rename from tests/acceptance/machine_mips_loongson3v.py rename to tests/avocado/machine_mips_loongson3v.py diff --git a/tests/acceptance/machine_mips_malta.py b/tests/avocado/machine= _mips_malta.py similarity index 100% rename from tests/acceptance/machine_mips_malta.py rename to tests/avocado/machine_mips_malta.py diff --git a/tests/acceptance/machine_rx_gdbsim.py b/tests/avocado/machine_= rx_gdbsim.py similarity index 100% rename from tests/acceptance/machine_rx_gdbsim.py rename to tests/avocado/machine_rx_gdbsim.py diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/avocado/ma= chine_s390_ccw_virtio.py similarity index 100% rename from tests/acceptance/machine_s390_ccw_virtio.py rename to tests/avocado/machine_s390_ccw_virtio.py diff --git a/tests/acceptance/machine_sparc64_sun4u.py b/tests/avocado/mach= ine_sparc64_sun4u.py similarity index 100% rename from tests/acceptance/machine_sparc64_sun4u.py rename to tests/avocado/machine_sparc64_sun4u.py diff --git a/tests/acceptance/machine_sparc_leon3.py b/tests/avocado/machin= e_sparc_leon3.py similarity index 100% rename from tests/acceptance/machine_sparc_leon3.py rename to tests/avocado/machine_sparc_leon3.py diff --git a/tests/acceptance/migration.py b/tests/avocado/migration.py similarity index 100% rename from tests/acceptance/migration.py rename to tests/avocado/migration.py diff --git a/tests/acceptance/multiprocess.py b/tests/avocado/multiprocess.= py similarity index 100% rename from tests/acceptance/multiprocess.py rename to tests/avocado/multiprocess.py diff --git a/tests/acceptance/pc_cpu_hotplug_props.py b/tests/avocado/pc_cp= u_hotplug_props.py similarity index 100% rename from tests/acceptance/pc_cpu_hotplug_props.py rename to tests/avocado/pc_cpu_hotplug_props.py diff --git a/tests/acceptance/ppc_405.py b/tests/avocado/ppc_405.py similarity index 100% rename from tests/acceptance/ppc_405.py rename to tests/avocado/ppc_405.py diff --git a/tests/acceptance/ppc_bamboo.py b/tests/avocado/ppc_bamboo.py similarity index 100% rename from tests/acceptance/ppc_bamboo.py rename to tests/avocado/ppc_bamboo.py diff --git a/tests/acceptance/ppc_mpc8544ds.py b/tests/avocado/ppc_mpc8544d= s.py similarity index 100% rename from tests/acceptance/ppc_mpc8544ds.py rename to tests/avocado/ppc_mpc8544ds.py diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/avocado/ppc_prep_40p.= py similarity index 100% rename from tests/acceptance/ppc_prep_40p.py rename to tests/avocado/ppc_prep_40p.py diff --git a/tests/acceptance/ppc_pseries.py b/tests/avocado/ppc_pseries.py similarity index 100% rename from tests/acceptance/ppc_pseries.py rename to tests/avocado/ppc_pseries.py diff --git a/tests/acceptance/ppc_virtex_ml507.py b/tests/avocado/ppc_virte= x_ml507.py similarity index 100% rename from tests/acceptance/ppc_virtex_ml507.py rename to tests/avocado/ppc_virtex_ml507.py diff --git a/tests/acceptance/replay_kernel.py b/tests/avocado/replay_kerne= l.py similarity index 100% rename from tests/acceptance/replay_kernel.py rename to tests/avocado/replay_kernel.py diff --git a/tests/acceptance/replay_linux.py b/tests/avocado/replay_linux.= py similarity index 100% rename from tests/acceptance/replay_linux.py rename to tests/avocado/replay_linux.py diff --git a/tests/acceptance/reverse_debugging.py b/tests/avocado/reverse_= debugging.py similarity index 100% rename from tests/acceptance/reverse_debugging.py rename to tests/avocado/reverse_debugging.py diff --git a/tests/acceptance/smmu.py b/tests/avocado/smmu.py similarity index 100% rename from tests/acceptance/smmu.py rename to tests/avocado/smmu.py diff --git a/tests/acceptance/tcg_plugins.py b/tests/avocado/tcg_plugins.py similarity index 100% rename from tests/acceptance/tcg_plugins.py rename to tests/avocado/tcg_plugins.py diff --git a/tests/acceptance/tesseract_utils.py b/tests/avocado/tesseract_= utils.py similarity index 100% rename from tests/acceptance/tesseract_utils.py rename to tests/avocado/tesseract_utils.py diff --git a/tests/acceptance/version.py b/tests/avocado/version.py similarity index 100% rename from tests/acceptance/version.py rename to tests/avocado/version.py diff --git a/tests/acceptance/virtio-gpu.py b/tests/avocado/virtio-gpu.py similarity index 100% rename from tests/acceptance/virtio-gpu.py rename to tests/avocado/virtio-gpu.py diff --git a/tests/acceptance/virtio_check_params.py b/tests/avocado/virtio= _check_params.py similarity index 100% rename from tests/acceptance/virtio_check_params.py rename to tests/avocado/virtio_check_params.py diff --git a/tests/acceptance/virtio_version.py b/tests/avocado/virtio_vers= ion.py similarity index 100% rename from tests/acceptance/virtio_version.py rename to tests/avocado/virtio_version.py diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/avocado/virtiof= s_submounts.py similarity index 100% rename from tests/acceptance/virtiofs_submounts.py rename to tests/avocado/virtiofs_submounts.py diff --git a/tests/acceptance/virtiofs_submounts.py.data/cleanup.sh b/tests= /avocado/virtiofs_submounts.py.data/cleanup.sh similarity index 100% rename from tests/acceptance/virtiofs_submounts.py.data/cleanup.sh rename to tests/avocado/virtiofs_submounts.py.data/cleanup.sh diff --git a/tests/acceptance/virtiofs_submounts.py.data/guest-cleanup.sh b= /tests/avocado/virtiofs_submounts.py.data/guest-cleanup.sh similarity index 100% rename from tests/acceptance/virtiofs_submounts.py.data/guest-cleanup.sh rename to tests/avocado/virtiofs_submounts.py.data/guest-cleanup.sh diff --git a/tests/acceptance/virtiofs_submounts.py.data/guest.sh b/tests/a= vocado/virtiofs_submounts.py.data/guest.sh similarity index 100% rename from tests/acceptance/virtiofs_submounts.py.data/guest.sh rename to tests/avocado/virtiofs_submounts.py.data/guest.sh diff --git a/tests/acceptance/virtiofs_submounts.py.data/host.sh b/tests/av= ocado/virtiofs_submounts.py.data/host.sh similarity index 100% rename from tests/acceptance/virtiofs_submounts.py.data/host.sh rename to tests/avocado/virtiofs_submounts.py.data/host.sh diff --git a/tests/acceptance/vnc.py b/tests/avocado/vnc.py similarity index 100% rename from tests/acceptance/vnc.py rename to tests/avocado/vnc.py diff --git a/tests/acceptance/x86_cpu_model_versions.py b/tests/avocado/x86= _cpu_model_versions.py similarity index 100% rename from tests/acceptance/x86_cpu_model_versions.py rename to tests/avocado/x86_cpu_model_versions.py --=20 2.31.1 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1636388282; cv=none; d=zohomail.com; s=zohoarc; b=moRHcwFg074vq/83A/w0a4Q0JS+sl8/iFDtqpn5e40FhHge3Nyw2xN+Nk6XV17tdOfy5a/o2bQRsvQFhA76qTKBP6Et5Y+YWB3Nn2CrrcmnGd3Z9YHD4J/CZqYzR5+TtV1U4Vy/eZegg0CLuVrzAvIKp8Ri7omuCcGjvtEEZKvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388282; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=SkxNHhX0QyQYxC8RhzB2xljeUh5RuXRUdAlFWY5fKNk=; b=ag64yuyyM/lJEyR1ykxW0Wjq9sHvlBZ1jFJjZYD6m8qZzlzUYabpWwPRPpfLHyNIYDcM6/GCZkIcPmHcZfTr+2hA0PLX+VoJW7NKVEy6Ax5YEkh9NE9+zlHH9CndVkhG5I64grPDbUXMuF8vK7Db/HPIQFVV9NV7RGH1sLu7RlY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1636388282023162.70153186612276; Mon, 8 Nov 2021 08:18:02 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-zFvg82QNMcmoU56P2F2alw-1; Mon, 08 Nov 2021 11:17:59 -0500 Received: by mail-wm1-f70.google.com with SMTP id y9-20020a1c7d09000000b003316e18949bso6408516wmc.5 for ; Mon, 08 Nov 2021 08:17:59 -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 a22sm2510255wme.19.2021.11.08.08.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:17:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388280; 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=SkxNHhX0QyQYxC8RhzB2xljeUh5RuXRUdAlFWY5fKNk=; b=XY3ZumX6Q5UwtHdIaN6qKhylY328syXBswK81xJPKA1y3uY5kUsptgaaTIYH7CwZxd4f82 wzf10nLJqwlOq7rdHR5eyBhVAIOddW1RaS0aej/eFa1gkwW9ILeirjoMlu3Zu9wSjQs1w9 PLdVbo7PsCec6HEfWJu9nuDjVHgZsuM= X-MC-Unique: zFvg82QNMcmoU56P2F2alw-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=SkxNHhX0QyQYxC8RhzB2xljeUh5RuXRUdAlFWY5fKNk=; b=SXl7QijTRdF+yU6bs0SS8Yy2x7Vq4cBoMkkCwZlLWLH01s1JTr0iLAWJKd0RgHv+k1 XG4XvR8l89HBIT75QPjQcAG0bexpLD3h0Mdx3rOyPQDaGvCRyWUu/E5cPAg1e4MRBLJM Miq3XReW0E++08sNtvvO5vIbC9yRaJ1s1PG+fCtLxKwTq83Ze8wkhqJnKTaHCiEjZact n+0VAYSdVxodlRJlvqTfrTfui6n1jArVWJHdOw8ruuaasSQ3iwqd1Nq4Nsrkdn+Fr4pg MXyVAKUS/wag6GEHQw+gt/j1RT994ooHoM9QowqtR7n1mAIRnYygi8ZQGZLXb3PBDdpp u38A== X-Gm-Message-State: AOAM533rLhBEv3GS01j1dCZyrgFECe+M9iLeh3KFdZ5+K81l2sT4Zlbp ZxsF+odI9WIwOYLRxWylj7ljSAn1LbNaTAp8lpm/4RpOtnnqlviWPHgeLXA6pHBzbZRXfvyFT8P byaBSlo3W+tDezQ== X-Received: by 2002:a1c:f601:: with SMTP id w1mr52958088wmc.112.1636388278672; Mon, 08 Nov 2021 08:17:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyU1qEb2Tt0PN1PqdGZQvCUOFktUodF1gpcslcUV8/wGW+gwQKWF5jQf9TVB/pKtfVN+BOkmA== X-Received: by 2002:a1c:f601:: with SMTP id w1mr52958068wmc.112.1636388278523; Mon, 08 Nov 2021 08:17:58 -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 3/9] tests/avocado: Extract QemuBaseTest from Test Date: Mon, 8 Nov 2021 17:17:33 +0100 Message-Id: <20211108161739.1371503-4-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: 1636388284349100001 From: Philippe Mathieu-Daud=C3=A9 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: <20211105143416.148332-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 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1636388287; cv=none; d=zohomail.com; s=zohoarc; b=URtv9xH2dS40iImo4iYLUwf64Y/5uIkX1i7Gt1cU+zczF/VCsurHsnDQAKcTDPg0bVDjrgvXNdtCFm4ryn7JMJNAJI5f/Nd87Y+ZuVe222okmwv6vSx6c49whtOaAdbT1ChvEVJ7N+QoAtoosrd3bK44qB5Cyroo+etjR6W3KOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388287; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=y6zrXawNuyqiVyJ30mXD2GbOXw3akV02RKQxe7ID2q4=; b=g5VCSe/bPBDBHy0Djg9G1leACrJcHklnz3PlvBnq5WwIVX4xReaCsFiS60MrtHydDyc4qBgSUALiJetpIgxzniHYTU9xGw+CdS9zVhudF47QIkPU9n7MYtnxfPpyVGfbPMXVa6qtxJ/5hurEwjGIwMlN9rZSqXXwP/X9T4TWLdY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1636388287707218.82828168961566; Mon, 8 Nov 2021 08:18:07 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-H1kVlhjLOVWwPIDn1rBEFw-1; Mon, 08 Nov 2021 11:18:05 -0500 Received: by mail-wm1-f69.google.com with SMTP id v10-20020a1cf70a000000b00318203a6bd1so66227wmh.6 for ; Mon, 08 Nov 2021 08:18:05 -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 n7sm17009343wra.37.2021.11.08.08.18.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:18:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388286; 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=y6zrXawNuyqiVyJ30mXD2GbOXw3akV02RKQxe7ID2q4=; b=ULRu3RLIB2lj6g+YFsiqJGzPLzxtmiUJy4fs4KqDqbeGfVSGcn+mMEjl4cEqiVBGKxfjE3 2RWDGOFuBNjusuD33R3T59r0YclaVi7HNURw1KG5coIGVzN7Ghg/12tBnuJGqvfjqGln6l G4By6aacnNRjopYhPzee+XJXh2A7u88= X-MC-Unique: H1kVlhjLOVWwPIDn1rBEFw-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=y6zrXawNuyqiVyJ30mXD2GbOXw3akV02RKQxe7ID2q4=; b=Ca0n4DZBGeiWDFlKqHr4uIPwAhe0/PMal7cmJxjGjK3yVjSrWYULj9b9dHblzWFrBL wqcW05RIakO3NFr65YsEwO8bxrZBVuxdcTmRqk/Mjx0OdRxawUVTps/rV7bL478pvPxe A09ciI/DtmFCdMF0+5pmVc2zCU0sQ3NmHZ8NLheoCPFlj8pDZPqqo6sRe5UxsMjWm1Ys Lrj44T9Ery22Q6+c4ogymCFgC6rPlBJkfbMDcyIOS+qmEHTBKkGNMaIYET5CrizqxAor 7Re0p56Azzg+d9zyWym1SDo4J1CF45yn9r/go4zDuWTGhKprIulRsyGCrnZ1ihBN/OiB KI3Q== X-Gm-Message-State: AOAM533qTnY5WECa+KVUSoDb/FyMPX73gKR0H0/adCfD22GCtBDbTep4 RnsK9XzqDbRPwnf3Ea8sDxNZ65i4evlgDwqOLtOTSEYKJzA1TE2AQe9Wro2oj+lxCMYdzmhaHBt JvzQz/KGC5Z+tsA== X-Received: by 2002:a5d:6151:: with SMTP id y17mr345717wrt.275.1636388283880; Mon, 08 Nov 2021 08:18:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJzEeKeZb3TcTYwVYViy2tBtU5eKsZUrCow4QVSzJ4P+3w6Vg1LbbaMc1xXq44U2KKNspGctUQ== X-Received: by 2002:a5d:6151:: with SMTP id y17mr345694wrt.275.1636388283726; Mon, 08 Nov 2021 08:18:03 -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 4/9] tests/avocado: Make pick_default_qemu_bin() more generic Date: Mon, 8 Nov 2021 17:17:34 +0100 Message-Id: <20211108161739.1371503-5-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: 1636388289197100001 From: Philippe Mathieu-Daud=C3=A9 Make pick_default_qemu_bin() generic to find qemu-system or qemu-user binaries. Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211105143416.148332-3-f4bug@amsat.org> --- tests/avocado/avocado_qemu/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index a495e106d03..984c554e7d6 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -45,7 +45,7 @@ def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) =20 =20 -def pick_default_qemu_bin(arch=3DNone): +def pick_default_qemu_bin(bin_prefix=3D'qemu-system-', arch=3DNone): """ Picks the path of a QEMU binary, starting either in the current working directory or in the source tree root directory. @@ -64,7 +64,7 @@ def pick_default_qemu_bin(arch=3DNone): # qemu binary path does not match arch for powerpc, handle it if 'ppc64le' in arch: arch =3D 'ppc64' - qemu_bin_relative_path =3D "./qemu-system-%s" % arch + qemu_bin_relative_path =3D os.path.join(".", bin_prefix + arch) if is_readable_executable_file(qemu_bin_relative_path): return qemu_bin_relative_path =20 @@ -179,14 +179,14 @@ def _get_unique_tag_val(self, tag_name): return vals.pop() return None =20 - def setUp(self): + def setUp(self, bin_prefix): self.arch =3D self.params.get('arch', default=3Dself._get_unique_tag_val('ar= ch')) =20 self.cpu =3D self.params.get('cpu', default=3Dself._get_unique_tag_val('cpu= ')) =20 - default_qemu_bin =3D pick_default_qemu_bin(arch=3Dself.arch) + default_qemu_bin =3D pick_default_qemu_bin(bin_prefix, arch=3Dself= .arch) self.qemu_bin =3D self.params.get('qemu_bin', default=3Ddefault_qemu_bin) if self.qemu_bin is None: @@ -214,7 +214,7 @@ class Test(QemuBaseTest): def setUp(self): self._vms =3D {} =20 - super().setUp() + super().setUp('qemu-system-') =20 self.machine =3D self.params.get('machine', default=3Dself._get_unique_tag_val(= 'machine')) --=20 2.31.1 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636388294; cv=none; d=zohomail.com; s=zohoarc; b=KKq0K04iEhVR1eq2Ai07zVmPsyNQlY3nSJL3FOAIQDZe56jCovhmQjKLTZYbj68c/0nadahhyn1pxGqHr7B83yvK3ZxeyAdl2y+C01AJ9a3W4HqIxwidKmYhpmCLkW3UIwr/HdGW27nHZbB5IAofhQaiOai1TQ+7pVOZcbfd9u0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Q83GXnv4mn5q9vEHpCdzjj3QzMBEEx65F0uNcqXi278=; b=SsA71y/FU+cJHT/C484smgU/SbsqiGMNN7Qy8yDdrkW9y/+OpbHaaAi/c0BtN6ebZoYpmRy+ZDuC1/Szx7eGzPLB2kLUjHjPewBa8uTK2xHfJOmYhskffoVnCRL7/+Fs3xBq6jSchyEOFQuQzTil1By/WoqLcBNnIbtd2BS9QZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 163638829406921.811431568222588; Mon, 8 Nov 2021 08:18:14 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-535-fa_u9CMiN7OYHU-kHvsIOQ-1; Mon, 08 Nov 2021 11:18:10 -0500 Received: by mail-wr1-f71.google.com with SMTP id p3-20020a056000018300b00186b195d4ddso4186465wrx.15 for ; Mon, 08 Nov 2021 08:18:10 -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 h27sm22494640wmc.43.2021.11.08.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:18:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388293; 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=Q83GXnv4mn5q9vEHpCdzjj3QzMBEEx65F0uNcqXi278=; b=h3ofPf4u5pt9MR12DF36nQ2te4WFUzyQwoGglujLTLcJwIa8niZ2n0T3seM1RI61BFfHDT hGiIgPr60l/Ixx6v6GBbcmJFmQLECoATFQTZ/EiR+hOpWWwB7dPl/dtJLEoq9w69Ae5xsd WSHnocK3115+yyulVRywQvxTyyiQBB8= X-MC-Unique: fa_u9CMiN7OYHU-kHvsIOQ-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=Q83GXnv4mn5q9vEHpCdzjj3QzMBEEx65F0uNcqXi278=; b=Jf7ElXEZfGtdL375eNBbkziAnkyRvtHPiIcHjayO+NumC2oJWiWrv0PQpEglZMXC3N lwkNQN1XNQ7Ll67IizZMYE46DmwgC7s8r3PgWxrOChOiovAVndpS1aVfHU89QYz6BbAp 4tcGrH2JgWQGfdqfDxR2FduQyz8RirshNLI2bjpwKXQuda1R+3OWGhMd2QmwLavg2Uw+ XvIudnsVnSh8E0OVwaI8YNffjK07FMu4t8/Sh1KUIWyFnHk0b9GORJvBQVU6ywtqb3mW xkbCsXqx1a7y7N1/ob8R6NMXSydtz/0GtGZCByJbzra0swcYvTdaaMix7IqQ8P+vTSs5 HOFw== X-Gm-Message-State: AOAM533yW83DlQDYJJNaLPrj1rhePBOZ4WXPQJdImS5lsacRrbEiDoda 5OmJxXsbNVSvEExBgXqM0yhJ/O2AJlfT4W96pUYjuA/1FjNMEoDckpuKeQILbHh8rM9Mts9w/5z B+GDEmS85PrsZSw== X-Received: by 2002:a5d:6151:: with SMTP id y17mr346472wrt.275.1636388289045; Mon, 08 Nov 2021 08:18:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyt67BYfeZJkBTHGMG4syN+U5t3txfagA/LjXH5Oz+mw1/5ioQsPLVptYK7wX7bFrJmmlEOEg== X-Received: by 2002:a5d:6151:: with SMTP id y17mr346442wrt.275.1636388288901; Mon, 08 Nov 2021 08:18:08 -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 5/9] tests/avocado: Introduce QemuUserTest base class Date: Mon, 8 Nov 2021 17:17:35 +0100 Message-Id: <20211108161739.1371503-6-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: 1636388295977100001 From: Philippe Mathieu-Daud=C3=A9 Similarly to the 'System' Test base class with methods for testing system emulation, the QemuUserTest class contains methods useful to test user-mode emulation. Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211105143416.148332-4-f4bug@amsat.org> --- tests/avocado/avocado_qemu/__init__.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index 984c554e7d6..e46b3ecb89e 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -17,7 +17,7 @@ import uuid =20 import avocado -from avocado.utils import cloudinit, datadrainer, network, ssh, vmimage +from avocado.utils import cloudinit, datadrainer, network, process, ssh, v= mimage from avocado.utils.path import find_command =20 #: The QEMU build root directory. It may also be the source directory @@ -295,6 +295,23 @@ def tearDown(self): super().tearDown() =20 =20 +class QemuUserTest(QemuBaseTest): + """Facilitates user-mode emulation tests.""" + + def setUp(self): + self._ldpath =3D [] + super().setUp('qemu-') + + def add_ldpath(self, ldpath): + self._ldpath.append(os.path.abspath(ldpath)) + + def run(self, bin_path, args=3D[]): + qemu_args =3D " ".join(["-L %s" % ldpath for ldpath in self._ldpat= h]) + bin_args =3D " ".join(args) + return process.run("%s %s %s %s" % (self.qemu_bin, qemu_args, + bin_path, bin_args)) + + class LinuxSSHMixIn: """Contains utility methods for interacting with a guest via SSH.""" =20 --=20 2.31.1 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1636388297; cv=none; d=zohomail.com; s=zohoarc; b=DK6BBklx78gcEOWJurXCp8GwywFKQi651nH7g9MkoXuhYocaKKXcjRbEoBvSmpiZ6WqDcuppVfcVW2tErTnSpRW92iyIQXTTX5+xT2jlub/DSC2oNQCKBVkF5TXZXg1shO/bYBEY87mVsRS0bH4TFYaptNiLStmLu4uLfwEA4/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388297; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Kig7GyB9MliSxk4dpCwMT9fFAcU2KC7uvJYsdHZHBGs=; b=ZOsY8VAH/DTYHu6OHJKXpKy5j4sZCtde0uqsL580dRjMUqoNpLYRvho4tDwO1LN9O4lIIweMpBiCUAlXzCAOPzXS/Qm74cUsKRvXLrtcUzsybnM0LA9qTRWdBGlWglLHVypqeKG90b55/UiwI97bXMiIQodjEiwIS9OvQMZ8dmM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1636388297988373.5938084354485; Mon, 8 Nov 2021 08:18:17 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-118-ldgSwG5QM_SWR43yOTdCIg-1; Mon, 08 Nov 2021 11:18:15 -0500 Received: by mail-wr1-f71.google.com with SMTP id d13-20020adf9b8d000000b00160a94c235aso4215296wrc.2 for ; Mon, 08 Nov 2021 08:18:15 -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 o9sm17308511wrs.4.2021.11.08.08.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:18:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388297; 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=Kig7GyB9MliSxk4dpCwMT9fFAcU2KC7uvJYsdHZHBGs=; b=HhKUpBcdcZ+DC8CYG5asQECizjef5UOG1V++eW8ehsAEfxGZZeAvWp0ypIcooDeU47xx/I v5iiivO7HMma6BMYcHkou9iyWRX7EUKyt894mbLHics73rv98GLNd2HvUfFTSxs1DLaL+r ZEbWXOw8lSOSnYmR8qI53+jf0YaVJTw= X-MC-Unique: ldgSwG5QM_SWR43yOTdCIg-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=Kig7GyB9MliSxk4dpCwMT9fFAcU2KC7uvJYsdHZHBGs=; b=IjvgLbE8uDCXx7askC3T2yr8oxxoonsQXUZRXK1vp0uk739te7E7vCEh25s4TfHhjK WVTa+TZgTb3chHLXlyLRur31ec0/zu2dzAwb8s+HHBDiB0TEYwc5RQY/mWWNY35ljqx2 yE9Cmos86po/NYA+S2ZNSHXOY6zYoHqRtiXn2EBOfsQ/0D4zCYeyFacYdarV2uv8V5oL FbfA9Mak4TtclXaVlvs3fkASDHWMTmqc49BLM/+Dh9ngdrzEwv2VGyDheLSbMRF+6/y7 KBgsTYAsJaApxqv4PDkDQt4WBz1qKMA0lfeJFWhOAC2uBbrSJPbMTjN6pHjVbtjkl0xw AHBg== X-Gm-Message-State: AOAM532fhvz+bEJ6Bj/YKsdGWx0pQu8zvkRKWwqmseB3NHpwkbYMKR6b 1JXYgbkEk1RT7hVVJwENF1+e3Sl4uABipcGA/xIDzXPxC+ppD8AvKLOEiN5ZHkEul4F99DAIzT3 0xV0DHFtTD78rAw== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr341699wrd.323.1636388294299; Mon, 08 Nov 2021 08:18:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJynbI3mbrMXZduZeg+EvCyMLLcq2njFLlgNhupiViSOWgSOf+YYtWqM9GWEwVlmYDsU9ZTvNg== X-Received: by 2002:adf:d1cd:: with SMTP id b13mr341660wrd.323.1636388294060; Mon, 08 Nov 2021 08:18:14 -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 6/9] tests/avocado: Share useful helpers from virtiofs_submounts test Date: Mon, 8 Nov 2021 17:17:36 +0100 Message-Id: <20211108161739.1371503-7-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: 1636388299013100001 From: Philippe Mathieu-Daud=C3=A9 Move the useful has_cmd()/has_cmds() helpers from the virtiofs test to the avocado_qemu public class. Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211105143416.148332-5-f4bug@amsat.org> --- tests/avocado/avocado_qemu/__init__.py | 57 +++++++++++++++++++++++++ tests/avocado/virtiofs_submounts.py | 59 +------------------------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index e46b3ecb89e..1efc22dabfa 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -11,6 +11,7 @@ import logging import os import shutil +import subprocess import sys import tempfile import time @@ -41,6 +42,62 @@ tcg_available) =20 =20 +def has_cmd(name, args=3DNone): + """ + This function is for use in a @avocado.skipUnless decorator, e.g.: + + @skipUnless(*has_cmd('sudo -n', ('sudo', '-n', 'true'))) + def test_something_that_needs_sudo(self): + ... + """ + + if args is None: + args =3D ('which', name) + + try: + _, stderr, exitcode =3D run_cmd(args) + except Exception as e: + exitcode =3D -1 + stderr =3D str(e) + + if exitcode !=3D 0: + cmd_line =3D ' '.join(args) + err =3D f'{name} required, but "{cmd_line}" failed: {stderr.strip(= )}' + return (False, err) + else: + return (True, '') + +def has_cmds(*cmds): + """ + This function is for use in a @avocado.skipUnless decorator and + allows checking for the availability of multiple commands, e.g.: + + @skipUnless(*has_cmds(('cmd1', ('cmd1', '--some-parameter')), + 'cmd2', 'cmd3')) + def test_something_that_needs_cmd1_and_cmd2(self): + ... + """ + + for cmd in cmds: + if isinstance(cmd, str): + cmd =3D (cmd,) + + ok, errstr =3D has_cmd(*cmd) + if not ok: + return (False, errstr) + + return (True, '') + +def run_cmd(args): + subp =3D subprocess.Popen(args, + stdout=3Dsubprocess.PIPE, + stderr=3Dsubprocess.PIPE, + universal_newlines=3DTrue) + stdout, stderr =3D subp.communicate() + ret =3D subp.returncode + + return (stdout, stderr, ret) + def is_readable_executable_file(path): return os.path.isfile(path) and os.access(path, os.R_OK | os.X_OK) =20 diff --git a/tests/avocado/virtiofs_submounts.py b/tests/avocado/virtiofs_s= ubmounts.py index 21ad7d792e7..e6dc32ffd4e 100644 --- a/tests/avocado/virtiofs_submounts.py +++ b/tests/avocado/virtiofs_submounts.py @@ -6,67 +6,12 @@ =20 from avocado import skipUnless from avocado_qemu import LinuxTest, BUILD_DIR +from avocado_qemu import has_cmds +from avocado_qemu import run_cmd from avocado_qemu import wait_for_console_pattern from avocado.utils import ssh =20 =20 -def run_cmd(args): - subp =3D subprocess.Popen(args, - stdout=3Dsubprocess.PIPE, - stderr=3Dsubprocess.PIPE, - universal_newlines=3DTrue) - stdout, stderr =3D subp.communicate() - ret =3D subp.returncode - - return (stdout, stderr, ret) - -def has_cmd(name, args=3DNone): - """ - This function is for use in a @avocado.skipUnless decorator, e.g.: - - @skipUnless(*has_cmd('sudo -n', ('sudo', '-n', 'true'))) - def test_something_that_needs_sudo(self): - ... - """ - - if args is None: - args =3D ('which', name) - - try: - _, stderr, exitcode =3D run_cmd(args) - except Exception as e: - exitcode =3D -1 - stderr =3D str(e) - - if exitcode !=3D 0: - cmd_line =3D ' '.join(args) - err =3D f'{name} required, but "{cmd_line}" failed: {stderr.strip(= )}' - return (False, err) - else: - return (True, '') - -def has_cmds(*cmds): - """ - This function is for use in a @avocado.skipUnless decorator and - allows checking for the availability of multiple commands, e.g.: - - @skipUnless(*has_cmds(('cmd1', ('cmd1', '--some-parameter')), - 'cmd2', 'cmd3')) - def test_something_that_needs_cmd1_and_cmd2(self): - ... - """ - - for cmd in cmds: - if isinstance(cmd, str): - cmd =3D (cmd,) - - ok, errstr =3D has_cmd(*cmd) - if not ok: - return (False, errstr) - - return (True, '') - - class VirtiofsSubmountsTest(LinuxTest): """ :avocado: tags=3Darch:x86_64 --=20 2.31.1 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1636388312; cv=none; d=zohomail.com; s=zohoarc; b=ImVhuPojAhrvA76+Zni17bPlc7PEZBJmw7FRSRB0WEYLn09IFXYbk7xjxmnFkoi6zqBt/PUGKPtupR4Bwq4DAcdPQBJDpFWoPoOhli1fuampdKIpLPS+gPLj0niRalETjnLWEs/UmCa/A0EdMi6bORslMQz5Hp/myZmMJMZkVfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388312; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HRNtpWns45KouVxWx+F2QK9RfjAkimgxL52hvvUyjt4=; b=I9IJSQQD/ywc7/pdbJXCZzyWxltAF9wx8fr8gc6oiblPW2CaOvy4nc/sJinXnEALrzLJrt8PQmfwTfvrtoz0hKTi2c7Wu3X9m6uQBw9tHqHHX4GXGctCkN5n+lHpQ48kelzZULpiGekpSAN1phooG2P36IsxQU9tuFmqXen8LG8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1636388312748205.4393787759601; Mon, 8 Nov 2021 08:18:32 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-58-VrD3CxB9Nf6UZozweX6-Dw-1; Mon, 08 Nov 2021 11:18:20 -0500 Received: by mail-wr1-f70.google.com with SMTP id f3-20020a5d50c3000000b00183ce1379feso4194009wrt.5 for ; Mon, 08 Nov 2021 08:18:20 -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 o10sm7694081wri.15.2021.11.08.08.18.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:18:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388311; 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=HRNtpWns45KouVxWx+F2QK9RfjAkimgxL52hvvUyjt4=; b=de3LvIrloCsOkSQA53fFqY8312bMk5FJVvNcZ5h5RQB8fksSxttHV1LtDNmyu76wc3b/cI BYHZq2t8asC8ft8rydsB1ukfXTsz8B2cqkmm6fgs0yoiD2D+qlBZ6jipIy3uyE/Vm7o8WF S0KSZ2eJQTkPL0RQX78IcXVfMQB01Oc= X-MC-Unique: VrD3CxB9Nf6UZozweX6-Dw-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=HRNtpWns45KouVxWx+F2QK9RfjAkimgxL52hvvUyjt4=; b=I+wfCdEdwz9NkAh2lLRbqt0PYw4Q8Uh02HHDcOL1hKY5WntdO4M01ZoTQt63hHigyb JIvPINdibs7fU6xVrQx+/a+Aogh1jDVjPCgrUmVUW71eCvIh2JC7OpcCvPwCnKLbrBxS 3UgrrzWjVOXWJCVFk8XLBMxvsh7yBDG/mwt/i/zqf+xgxAUUJdTbWCuktcOYW5oVFwbU sp+iXy23nM0VdZ4SK/8fbrnRalIJ+B/P2ErsEXedInmeB6dOUOnpLUx5xLM7jZ6wLQGW Xl8T/HWr/78ena/JPpQ//pk+H9djosLRk3PIUs0cylHIXtGWrquPGFfY1vIng3FM085F lv3w== X-Gm-Message-State: AOAM533CBD12ABq5Jh7vRr38ZFEjLvtOCdVlvFHEoFUh6pHrkWPYaGSu 3UrBLhJpGW6A1HSQCCw8VPNnJijExakgti9yQkWiphgLFroxoSixLcKbTYxLMeF+bTCoVtBCeBf ZksarZDOy9XFrng== X-Received: by 2002:a1c:7f0c:: with SMTP id a12mr519713wmd.14.1636388299514; Mon, 08 Nov 2021 08:18:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyf6UIKMvlOcPb/WxgPWdga/4PFSVv/zknW5FmByjRxxaghC+j0fVTlqY4UX9AyLqY7Xf5wmw== X-Received: by 2002:a1c:7f0c:: with SMTP id a12mr519690wmd.14.1636388299361; Mon, 08 Nov 2021 08:18:19 -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 7/9] tests/avocado: Add bFLT loader linux-user test Date: Mon, 8 Nov 2021 17:17:37 +0100 Message-Id: <20211108161739.1371503-8-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: 1636388313661100001 From: Philippe Mathieu-Daud=C3=A9 Add a very quick test that runs a busybox binary in bFLT format: $ AVOCADO_ALLOW_UNTRUSTED_CODE=3D1 \ avocado --show=3Dapp run -t linux_user tests/avocado/load_bflt.py JOB ID : db94d5960ce564c50904d666a7e259148c27e88f JOB LOG : ~/avocado/job-results/job-2019-06-25T10.52-db94d59/job.log (1/1) tests/avocado/load_bflt.py:LoadBFLT.test_stm32: PASS (0.15 s) RESULTS : PASS 1 | ERROR 0 | FAIL 0 | SKIP 0 | WARN 0 | INTERRUPT 0 | = CANCEL 0 JOB TIME : 0.54 s Reviewed-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211105143416.148332-6-f4bug@amsat.org> --- tests/avocado/load_bflt.py | 54 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tests/avocado/load_bflt.py diff --git a/tests/avocado/load_bflt.py b/tests/avocado/load_bflt.py new file mode 100644 index 00000000000..bb50cec1ee8 --- /dev/null +++ b/tests/avocado/load_bflt.py @@ -0,0 +1,54 @@ +# Test the bFLT loader format +# +# Copyright (C) 2019 Philippe Mathieu-Daud=C3=A9 +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import bz2 +import subprocess + +from avocado import skipUnless +from avocado_qemu import QemuUserTest +from avocado_qemu import has_cmd + + +class LoadBFLT(QemuUserTest): + + def extract_cpio(self, cpio_path): + """ + Extracts a cpio archive into the test workdir + + :param cpio_path: path to the cpio archive + """ + cwd =3D os.getcwd() + os.chdir(self.workdir) + with bz2.open(cpio_path, 'rb') as archive_cpio: + subprocess.run(['cpio', '-i'], input=3Darchive_cpio.read(), + stderr=3Dsubprocess.DEVNULL) + os.chdir(cwd) + + @skipUnless(*has_cmd('cpio')) + @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted code= ') + def test_stm32(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dlinux_user + :avocado: tags=3Dquick + """ + # See https://elinux.org/STM32#User_Space + rootfs_url =3D ('https://elinux.org/images/5/51/' + 'Stm32_mini_rootfs.cpio.bz2') + rootfs_hash =3D '9f065e6ba40cce7411ba757f924f30fcc57951e6' + rootfs_path_bz2 =3D self.fetch_asset(rootfs_url, asset_hash=3Droot= fs_hash) + busybox_path =3D os.path.join(self.workdir, "/bin/busybox") + + self.extract_cpio(rootfs_path_bz2) + + res =3D self.run(busybox_path) + ver =3D 'BusyBox v1.24.0.git (2015-02-03 22:17:13 CET) multi-call = binary.' + self.assertIn(ver, res.stdout_text) + + res =3D self.run(busybox_path, ['uname', '-a']) + unm =3D 'armv7l GNU/Linux' + self.assertIn(unm, res.stdout_text) --=20 2.31.1 From nobody Mon Feb 9 14:00:54 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 From nobody Mon Feb 9 14:00:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1636388314; cv=none; d=zohomail.com; s=zohoarc; b=OiSYcmhNtPrmSCXBT9OkdkVz+qLS5JrS8Yr63Co9VbqHwsVqwU2LJyleVsS+0C87r9X13rJeZzrxHJzSK3xuwRcHPP9spNkFt/DkpfYyvoCml8F7bXxGWHacF4Yn6rCG8SVf2PRvKUgHl1Qc1rNr0TXbQzJqz6E5fKWe8nLREng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636388314; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=yDng3rtDhMlL58W7zS3aIpWMI+GR3niTjki+q/as+es=; b=mdWDFjP0hmTiC1CTZHDFo+twZcPAuitlwIMI8vY5gYwPcbJzrLY2OXhVV2IZnYE7GGejVROyxHNXeDkswvpQCPflPA2XM7Ngs6ilPjbaRX8VgS9MzB88KIKe7W9aDWHc/Dz6xPuqgeCXLIgVE4wjRLro9W4+6Ugaq8ON6MTdT2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1636388314294434.4632973982766; Mon, 8 Nov 2021 08:18:34 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-254-4vtoveYKM8e569jaf9q8cg-1; Mon, 08 Nov 2021 11:18:32 -0500 Received: by mail-wm1-f71.google.com with SMTP id g11-20020a1c200b000000b003320d092d08so6399304wmg.9 for ; Mon, 08 Nov 2021 08:18:31 -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 z7sm19519765wmi.33.2021.11.08.08.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 08:18:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636388313; 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=yDng3rtDhMlL58W7zS3aIpWMI+GR3niTjki+q/as+es=; b=JTfC/yEvoWJ2qjqjngesBw70ZoDTks+Tf35e5mAqJN5BhDH/G7tIEcP64YpdV+QP/1bEbl u4dtRYQMLnv38az3V+SXZXZTMdhUpMgnwOsTQqK6ns6QU1usyrF24heedXy/CkLjL9hhOW 0kzaNulTPgTzQI7EsbEj/TiSI9OYgfE= X-MC-Unique: 4vtoveYKM8e569jaf9q8cg-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=yDng3rtDhMlL58W7zS3aIpWMI+GR3niTjki+q/as+es=; b=Pqbcn34d7W1r+PnHPMCvzrTQxlM/J3C8WiTaldlgqn3Llnx3YM2sTvc2PieBBK8qll BzDTrRw4pe0S5fzMHNZJ3AJHDlepVxLMNKGGVCz9/6XxyGoMCHH+XWIZxvslxdUdI1kG SBb3HEO2ROYgzRIYH3L7zDe96aPGUV3K1F/6CpdMZuYSq0Rwp8zg5YoJ9yd9mz8qsGCt lwQIe5mt0eaGGwAIfPBUPPe7SOQIRrjfG90K18Vply5dOion4WaI/chRLhnaoMJWOM3X 9gOfZ/ck49eHqpExljmsuLbkhWsU11dzchCsvUti4rTYeuAtYO6PlUejTj+e6AJChFDl ytRg== X-Gm-Message-State: AOAM533KSOBe5ZXDgyPYqzBKEdBQTMQvgl6pteRE8JGjdpMcD//Ypbgn /Sst3dnLA4yYdIfpJ5nuKFfmbsXBP1iYvyKTlcNSaucBY1HngxqBBhDtM8Q7b84UPyGu88pU1gl 1+sQlA2aQWEWHWg== X-Received: by 2002:a1c:4c06:: with SMTP id z6mr37706033wmf.185.1636388311106; Mon, 08 Nov 2021 08:18:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJwS4x2ccmdc2bTTksQ4uzVFFnLKQv0NUl6SHBnXoPxon/E4TqvzPGHPWxUKsCaDtXXkF+iL+w== X-Received: by 2002:a1c:4c06:: with SMTP id z6mr37706019wmf.185.1636388310973; Mon, 08 Nov 2021 08:18:30 -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?= , Joaquin de Andres Subject: [PULL 9/9] tests/avocado: Remove p7zip binary availability check Date: Mon, 8 Nov 2021 17:17:39 +0100 Message-Id: <20211108161739.1371503-10-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: 1636388315013100003 The single use of the 7z binary has been removed in commit a30e114f3 ("tests/acceptance: remove Armbian 19.11.3 test for orangepi-pc"), we don't need to check for this binary availability anymore. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Joaquin de Andres Reviewed-by: Willian Rampazzo Message-Id: <20211106091059.465109-1-philmd@redhat.com> --- tests/avocado/boot_linux_console.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 4ed01ed7893..9c618d4809f 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -22,13 +22,6 @@ from avocado_qemu import wait_for_console_pattern from avocado.utils import process from avocado.utils import archive -from avocado.utils.path import find_command, CmdNotFoundError - -P7ZIP_AVAILABLE =3D True -try: - find_command('7z') -except CmdNotFoundError: - P7ZIP_AVAILABLE =3D False =20 """ Round up to next power of 2 --=20 2.31.1