From nobody Sun Nov 24 10:40:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1725446770; cv=none; d=zohomail.com; s=zohoarc; b=EylGGus8E4HMV2yrVDzsc0n8kVDVwyMoK4MxSV8sNbj9lD7sMjG6V34hVcG8vpHY1VO7znwlrxpfStpuHW2Hbx6dcmibZZ2+6DdC8XPhGLSIcg7eF4iN3lnfCbNczGgDT+Oa66kqZVr/avSwDVww/QgqBO2wuJpWIxAQfH42dkg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725446770; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=U9OCf7f58k1KQ8jS5Trjzpc4/7cD3WA41IpBNB/dFDs=; b=cJXWeIxn3kNlpxj6rCobFEAMki1zJ2XCXw4WpPkr7xeMYNep7xwImWbGYvSb/SAKrPpoT8z/ONb8SVnJeQphL/mGqgZZsYeetGBsuYNOk9NzttDzgTJw7w6XctIuXNk0Ojgte8yabdTvcPoLgYZeHBQaY8NJnvx1mNvoAwG5ZDE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725446770116392.76288757463703; Wed, 4 Sep 2024 03:46:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1slnRR-0004YE-6A; Wed, 04 Sep 2024 06:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slnRP-0004HT-EA for qemu-devel@nongnu.org; Wed, 04 Sep 2024 06:40:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slnRN-0000MK-Di for qemu-devel@nongnu.org; Wed, 04 Sep 2024 06:40:47 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-B8hVkk0CN6u3OGWe62dlRg-1; Wed, 04 Sep 2024 06:40:41 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A8C1E19560A7; Wed, 4 Sep 2024 10:40:40 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.48]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AE3881955F44; Wed, 4 Sep 2024 10:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725446444; 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=U9OCf7f58k1KQ8jS5Trjzpc4/7cD3WA41IpBNB/dFDs=; b=T/i/3lfbkQP5Pi1BAdZLI0i+d2EGaBIwaEdPvvPJZq46Ztr/jWWD3ee7blV1jNg+tovXrM vetiECgJYOwja59es/XDSgk824o7pCCgE9yblkArKlDL/JzzMyVCBwti0vLyPKk65EPSM0 MUeOnhFqBaB+1qeYgbRjuBsISvc70v8= X-MC-Unique: B8hVkk0CN6u3OGWe62dlRg-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , Stefan Hajnoczi Subject: [PULL 26/42] tests/functional: Convert the ppc_hv avocado test into a standalone test Date: Wed, 4 Sep 2024 12:39:01 +0200 Message-ID: <20240904103923.451847-27-thuth@redhat.com> In-Reply-To: <20240904103923.451847-1-thuth@redhat.com> References: <20240904103923.451847-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1725446771564116600 A straight forward conversion, we just also have to remove the decorator @skipUnless(os.getenv('SPEED')) since all non-trivial functional tests are running in SPEED=3Dthorough mode now. Also make sure that the extracted assets are writable, so that the test does not fail if it gets re-run and there are stale read-only files already around. Message-ID: <20240830133841.142644-28-thuth@redhat.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- tests/functional/meson.build | 2 + .../test_ppc64_hv.py} | 52 ++++++++----------- 3 files changed, 24 insertions(+), 32 deletions(-) rename tests/{avocado/ppc_hv_tests.py =3D> functional/test_ppc64_hv.py} (8= 5%) mode change 100644 =3D> 100755 diff --git a/MAINTAINERS b/MAINTAINERS index ee291e6d55..52b53d693e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1531,7 +1531,7 @@ F: tests/qtest/libqos/*spapr* F: tests/qtest/rtas* F: tests/qtest/libqos/rtas* F: tests/functional/test_ppc64_pseries.py -F: tests/avocado/ppc_hv_tests.py +F: tests/functional/test_ppc64_hv.py =20 PowerNV (Non-Virtualized) M: C=C3=A9dric Le Goater diff --git a/tests/functional/meson.build b/tests/functional/meson.build index f0f0cbd500..fcb99c547d 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -13,6 +13,7 @@ endif test_timeouts =3D { 'netdev_ethtool' : 180, 'ppc_40p' : 240, + 'ppc64_hv' : 1000, 'ppc64_powernv' : 120, 'ppc64_pseries' : 120, 's390x_ccw_virtio' : 180, @@ -68,6 +69,7 @@ tests_ppc_system_thorough =3D [ ] =20 tests_ppc64_system_thorough =3D [ + 'ppc64_hv', 'ppc64_powernv', 'ppc64_pseries', ] diff --git a/tests/avocado/ppc_hv_tests.py b/tests/functional/test_ppc64_hv= .py old mode 100644 new mode 100755 similarity index 85% rename from tests/avocado/ppc_hv_tests.py rename to tests/functional/test_ppc64_hv.py index 0e83bbac71..1a6e4b6d07 --- a/tests/avocado/ppc_hv_tests.py +++ b/tests/functional/test_ppc64_hv.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Tests that specifically try to exercise hypervisor features of the # target machines. powernv supports the Power hypervisor ISA, and # pseries supports the nested-HV hypervisor spec. @@ -7,10 +9,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 import skipIf, skipUnless -from avocado.utils import archive -from avocado_qemu import QemuSystemTest -from avocado_qemu import wait_for_console_pattern, exec_command +from unittest import skipIf, skipUnless +from qemu_test import QemuSystemTest, Asset +from qemu_test import wait_for_console_pattern, exec_command import os import time import subprocess @@ -45,8 +46,7 @@ def missing_deps(): # QEMU already installed and use that. # XXX: The order of these tests seems to matter, see git blame. @skipIf(missing_deps(), 'dependencies (%s) not installed' % ','.join(deps)) -@skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited') -@skipUnless(os.getenv('SPEED') =3D=3D 'slow', 'runtime limited') +@skipUnless(os.getenv('QEMU_TEST_ALLOW_LARGE_STORAGE'), 'storage limited') class HypervisorTest(QemuSystemTest): =20 timeout =3D 1000 @@ -54,6 +54,11 @@ class HypervisorTest(QemuSystemTest): panic_message =3D 'Kernel panic - not syncing' good_message =3D 'VFS: Cannot open root device' =20 + ASSET_ISO =3D Asset( + ('https://dl-cdn.alpinelinux.org/alpine/v3.18/' + 'releases/ppc64le/alpine-standard-3.18.4-ppc64le.iso'), + 'c26b8d3e17c2f3f0fed02b4b1296589c2390e6d5548610099af75300edd7b3ff') + def extract_from_iso(self, iso, path): """ Extracts a file from an iso file into the test workdir @@ -72,6 +77,7 @@ def extract_from_iso(self, iso, path): subprocess.run(cmd.split(), stdout=3Dsubprocess.DEVNULL, stderr=3Dsubproces= s.DEVNULL) =20 + os.chmod(filename, 0o600) os.chdir(cwd) =20 # Return complete path to extracted file. Because callers to @@ -83,16 +89,9 @@ def extract_from_iso(self, iso, path): def setUp(self): super().setUp() =20 - iso_url =3D ('https://dl-cdn.alpinelinux.org/alpine/v3.18/releases= /ppc64le/alpine-standard-3.18.4-ppc64le.iso') - - # Alpine use sha256 so I recalculated this myself - iso_sha256 =3D 'c26b8d3e17c2f3f0fed02b4b1296589c2390e6d5548610099a= f75300edd7b3ff' - iso_path =3D self.fetch_asset(iso_url, asset_hash=3Diso_sha256, - algorithm =3D "sha256") - - self.iso_path =3D iso_path - self.vmlinuz =3D self.extract_from_iso(iso_path, '/boot/vmlinuz-lt= s') - self.initramfs =3D self.extract_from_iso(iso_path, '/boot/initramf= s-lts') + self.iso_path =3D self.ASSET_ISO.fetch() + self.vmlinuz =3D self.extract_from_iso(self.iso_path, '/boot/vmlin= uz-lts') + self.initramfs =3D self.extract_from_iso(self.iso_path, '/boot/ini= tramfs-lts') =20 def do_start_alpine(self): self.vm.set_console() @@ -158,12 +157,8 @@ def do_test_kvm(self, hpt=3DFalse): wait_for_console_pattern(self, 'alpine:~#') =20 def test_hv_pseries(self): - """ - :avocado: tags=3Darch:ppc64 - :avocado: tags=3Dmachine:pseries - :avocado: tags=3Daccel:tcg - """ self.require_accelerator("tcg") + self.set_machine('pseries') self.vm.add_args("-accel", "tcg,thread=3Dmulti") self.vm.add_args('-device', 'nvme,serial=3D1234,drive=3Ddrive0') self.vm.add_args("-machine", "x-vof=3Don,cap-nested-hv=3Don") @@ -173,12 +168,8 @@ def test_hv_pseries(self): self.do_stop_alpine() =20 def test_hv_pseries_kvm(self): - """ - :avocado: tags=3Darch:ppc64 - :avocado: tags=3Dmachine:pseries - :avocado: tags=3Daccel:kvm - """ self.require_accelerator("kvm") + self.set_machine('pseries') self.vm.add_args("-accel", "kvm") self.vm.add_args('-device', 'nvme,serial=3D1234,drive=3Ddrive0') self.vm.add_args("-machine", "x-vof=3Don,cap-nested-hv=3Don,cap-cc= f-assist=3Doff") @@ -188,12 +179,8 @@ def test_hv_pseries_kvm(self): self.do_stop_alpine() =20 def test_hv_powernv(self): - """ - :avocado: tags=3Darch:ppc64 - :avocado: tags=3Dmachine:powernv - :avocado: tags=3Daccel:tcg - """ self.require_accelerator("tcg") + self.set_machine('powernv') self.vm.add_args("-accel", "tcg,thread=3Dmulti") self.vm.add_args('-device', 'nvme,bus=3Dpcie.2,addr=3D0x0,serial= =3D1234,drive=3Ddrive0', '-device', 'e1000e,netdev=3Dnet0,mac=3DC0:FF:EE:0= 0:00:02,bus=3Dpcie.0,addr=3D0x0', @@ -203,3 +190,6 @@ def test_hv_powernv(self): self.do_test_kvm() self.do_test_kvm(True) self.do_stop_alpine() + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.46.0