From nobody Sun Nov 24 20:56:51 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=1720699030; cv=none; d=zohomail.com; s=zohoarc; b=Uv7wUMAYMvt+8MiPviQuVliAqTUzeZjZAY06O1MlbG6oCK9RUkRhn3m4/odHPgNimcSUlPrMLk1MErhO3Hz9Hx0xPK/NcassXguJX8nb/kZRO3mC7/lWEc6qIfXJUY0MK+G3UyQzJwVgdPTsboMuIKLD02R274IoV2D4twaDd2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720699030; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L5PcsCgL2IcK8j5iQ5rWgADeldCnm0hNp0IysS8YInY=; b=akbpwRe4nOpY+pVUuGtnQCXA6WFdNrDLQpqnwSS0FvyI3QNeNMrNYG5j0XI7o/+TPzgOPaDZK1WcxFwXmmAM49YH4FaNVkL0pnFAkM60aX5Lx5HifkFTuP7mF2rwFX3nlGY9PvL2NQdFaMmmhh2ty8ngqh4GazltXmQyunWhBoQ= 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 1720699030769779.6046351698845; Thu, 11 Jul 2024 04:57:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRsPz-00059L-VZ; Thu, 11 Jul 2024 07:57:01 -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 1sRsPd-0004GY-ME for qemu-devel@nongnu.org; Thu, 11 Jul 2024 07:56:37 -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 1sRsPa-0004ER-Un for qemu-devel@nongnu.org; Thu, 11 Jul 2024 07:56:37 -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-647-X1AUam9sNcW5Bpm4uk_6dg-1; Thu, 11 Jul 2024 07:56:32 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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 308251944DFE; Thu, 11 Jul 2024 11:56:31 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.118]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E636D1955E85; Thu, 11 Jul 2024 11:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720698994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=L5PcsCgL2IcK8j5iQ5rWgADeldCnm0hNp0IysS8YInY=; b=cPIGj1Gn959lUGaSMsAig1mQsB+/2ZRVGCBs5+AJYXpYfY5L2GmOdrpuVjSJG+Cznne3n9 KsMxsOPOHN3xSlffNSHCl8LED3wxw0Z+vD5m0KesXSektp8+6Sa8fuWDswTdJ9VnohGncI G5QCwde7RcCt482ilj2d3JjZrANewpE= X-MC-Unique: X1AUam9sNcW5Bpm4uk_6dg-1 From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Ani Sinha , Richard Henderson , Paolo Bonzini , "Daniel P . Berrange" , John Snow Subject: [RFC PATCH 8/8] tests/pytest: Convert avocado test that needed avocado.utils.archive Date: Thu, 11 Jul 2024 13:55:46 +0200 Message-ID: <20240711115546.40859-9-thuth@redhat.com> In-Reply-To: <20240711115546.40859-1-thuth@redhat.com> References: <20240711115546.40859-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: 1720699032758116600 Content-Type: text/plain; charset="utf-8" Instead of using the "archive" module from avocado.utils, switch these tests to use the new wrapper function that is based on the "tarfile" module instead. Signed-off-by: Thomas Huth --- tests/pytest/meson.build | 5 +++++ .../test_arm_canona1100.py} | 16 +++++++--------- .../test_ppc_bamboo.py} | 18 ++++++------------ 3 files changed, 18 insertions(+), 21 deletions(-) rename tests/{avocado/machine_arm_canona1100.py =3D> pytest/test_arm_canon= a1100.py} (74%) rename tests/{avocado/ppc_bamboo.py =3D> pytest/test_ppc_bamboo.py} (75%) diff --git a/tests/pytest/meson.build b/tests/pytest/meson.build index d3607db362..baaacf00cc 100644 --- a/tests/pytest/meson.build +++ b/tests/pytest/meson.build @@ -9,6 +9,7 @@ pytests_generic =3D [ ] =20 pytests_arm =3D [ + 'arm_canona1100', 'machine_arm_n8x0', ] =20 @@ -24,6 +25,10 @@ pytests_mips64el =3D [ 'machine_mips_loongson3v', ] =20 +pytests_ppc =3D [ + 'ppc_bamboo', +] + pytests_x86_64 =3D [ 'cpu_queries', 'mem_addr_space', diff --git a/tests/avocado/machine_arm_canona1100.py b/tests/pytest/test_ar= m_canona1100.py similarity index 74% rename from tests/avocado/machine_arm_canona1100.py rename to tests/pytest/test_arm_canona1100.py index a42d8b0f2b..296df41a06 100644 --- a/tests/avocado/machine_arm_canona1100.py +++ b/tests/pytest/test_arm_canona1100.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 QemuSystemTest -from avocado_qemu import wait_for_console_pattern -from avocado.utils import archive +from qemu_pytest import QemuSystemTest +from qemu_pytest import wait_for_console_pattern +from qemu_pytest.utils import archive_extract =20 class CanonA1100Machine(QemuSystemTest): """Boots the barebox firmware and checks that the console is operation= al""" @@ -18,16 +18,14 @@ class CanonA1100Machine(QemuSystemTest): timeout =3D 90 =20 def test_arm_canona1100(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:canon-a1100 - :avocado: tags=3Ddevice:pflash_cfi02 - """ + self.machine =3D 'canon-a1100' + tar_url =3D ('https://qemu-advcal.gitlab.io' '/qac-best-of-multiarch/download/day18.tar.xz') tar_hash =3D '068b5fc4242b29381acee94713509f8a876e9db6' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - archive.extract(file_path, self.workdir) + archive_extract(file_path, dest_dir=3Dself.workdir, + member=3D"day18/barebox.canon-a1100.bin") self.vm.set_console() self.vm.add_args('-bios', self.workdir + '/day18/barebox.canon-a1100.bin') diff --git a/tests/avocado/ppc_bamboo.py b/tests/pytest/test_ppc_bamboo.py similarity index 75% rename from tests/avocado/ppc_bamboo.py rename to tests/pytest/test_ppc_bamboo.py index a81be3d608..4964dedbfe 100644 --- a/tests/avocado/ppc_bamboo.py +++ b/tests/pytest/test_ppc_bamboo.py @@ -5,30 +5,24 @@ # 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.utils import archive -from avocado_qemu import QemuSystemTest -from avocado_qemu import wait_for_console_pattern -from avocado_qemu import exec_command_and_wait_for_pattern +from qemu_pytest.utils import archive_extract +from qemu_pytest import QemuSystemTest +from qemu_pytest import wait_for_console_pattern +from qemu_pytest import exec_command_and_wait_for_pattern =20 class BambooMachine(QemuSystemTest): =20 timeout =3D 90 =20 def test_ppc_bamboo(self): - """ - :avocado: tags=3Darch:ppc - :avocado: tags=3Dmachine:bamboo - :avocado: tags=3Dcpu:440epb - :avocado: tags=3Ddevice:rtl8139 - :avocado: tags=3Daccel:tcg - """ + self.machine =3D 'bamboo' self.require_accelerator("tcg") self.require_netdev('user') tar_url =3D ('http://landley.net/aboriginal/downloads/binaries/' 'system-image-powerpc-440fp.tar.gz') tar_hash =3D '53e5f16414b195b82d2c70272f81c2eedb39bad9' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) - archive.extract(file_path, self.workdir) + archive_extract(file_path, self.workdir) self.vm.set_console() self.vm.add_args('-kernel', self.workdir + '/system-image-powerpc-440fp/linux', --=20 2.45.2