From nobody Thu Sep 19 01:12:44 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=1721843859; cv=none; d=zohomail.com; s=zohoarc; b=cE0YIlJBY6fEf2LBNUd3+YV8T+uiXEqBHRBXzLWK2iJFoMZncTBeVEPTacKeg8xYS7oj5Gfz19oS5YkPh2qI6WhC8d2M7iRIaccCUetABpr5EoDFFkj0+BAREvKYuf3vsX2jn12NC7x0SWsX2vA5ko5VhmnFHp2CqxALf2SL5DA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721843859; 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=/iVwrkfmrnEA9+FpEN+ehUGiwQgBnydQFBz8T0Xrytk=; b=Fo3lVV3wIoprS2DaQ/uVVxVmmVUMJ68X/6l6VuUKNw5ks9ZTUmPclMChf7xUhEULFU1yTjji6c//tHDO963TYQbwcTkeUO8/TDEvfDZh2dINW+I6+/rbvvfQxVV4Z33oCxR9B8InBdDzYEN6jOaVdPgvquzDKkrHDH9buZGZ/+8= 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 1721843859058152.35866541990003; Wed, 24 Jul 2024 10:57:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sWgDY-0004bm-62; Wed, 24 Jul 2024 13:56:00 -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 1sWgCq-0000lM-1u for qemu-devel@nongnu.org; Wed, 24 Jul 2024 13:55:17 -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 1sWgCg-0006CX-J8 for qemu-devel@nongnu.org; Wed, 24 Jul 2024 13:55:10 -0400 Received: from mx-prod-mc-01.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-203-bXfHVF7dMeKDgxMY40a6oQ-1; Wed, 24 Jul 2024 13:55:02 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DF163195421A; Wed, 24 Jul 2024 17:55:00 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.144]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 795141955D42; Wed, 24 Jul 2024 17:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721843703; 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=/iVwrkfmrnEA9+FpEN+ehUGiwQgBnydQFBz8T0Xrytk=; b=gqRmFTBOPgJYVdAF0u++Fx0Db9lttVoX5ENtmVRXrxjsJ/BQe+1LHaf2bMtRafCmqTwRq7 b2oE3kVTZQZH6OwUKuckkwpQagFcHACZ8Xa5myRA4h+stuzsJUWcfRmpLUsGODVfhdz+Gd oDzvfOA3eUixbgZKnytD88kFnETnLP4= X-MC-Unique: bXfHVF7dMeKDgxMY40a6oQ-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 , qemu-ppc@nongnu.org, Fabiano Rosas Subject: [PATCH v2 22/23] tests/functional: Convert the rx_gdbsim avocado test into a standalone test Date: Wed, 24 Jul 2024 19:52:40 +0200 Message-ID: <20240724175248.1389201-23-thuth@redhat.com> In-Reply-To: <20240724175248.1389201-1-thuth@redhat.com> References: <20240724175248.1389201-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.136, 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, 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: 1721843860726116600 Content-Type: text/plain; charset="utf-8" Provide a "gzip_uncompress" function based on the standard "gzip" module to avoid the usage of avocado.utils here. Signed-off-by: Thomas Huth --- Note: Make sure to apply this fix first before running this test: https://lore.kernel.org/qemu-devel/20240724045659.160684-1-richard.henders= on@linaro.org/ tests/functional/meson.build | 4 +++ tests/functional/qemu_test/utils.py | 12 +++++++ .../test_rx_gdbsim.py} | 34 +++++++++---------- 3 files changed, 33 insertions(+), 17 deletions(-) rename tests/{avocado/machine_rx_gdbsim.py =3D> functional/test_rx_gdbsim.= py} (78%) mode change 100644 =3D> 100755 diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 52328f44b6..3ae169897f 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -79,6 +79,10 @@ tests_riscv64_quick =3D [ 'riscv_opensbi', ] =20 +tests_rx_thorough =3D [ + 'rx_gdbsim', +] + tests_s390x_thorough =3D [ 's390x_ccw_virtio', 's390x_topology', diff --git a/tests/functional/qemu_test/utils.py b/tests/functional/qemu_te= st/utils.py index a12dac51b6..99eae5fc45 100644 --- a/tests/functional/qemu_test/utils.py +++ b/tests/functional/qemu_test/utils.py @@ -8,6 +8,7 @@ # 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 +import gzip import lzma import os import shutil @@ -23,6 +24,17 @@ def archive_extract(archive, dest_dir, member=3DNone): else: tf.extractall(path=3Ddest_dir) =20 +def gzip_uncompress(gz_path, output_path): + if os.path.exists(output_path): + return + with gzip.open(gz_path, 'rb') as gz_in: + try: + with open(output_path, 'wb') as raw_out: + shutil.copyfileobj(gz_in, raw_out) + except: + os.remove(output_path) + raise + def lzma_uncompress(xz_path, output_path): if os.path.exists(output_path): return diff --git a/tests/avocado/machine_rx_gdbsim.py b/tests/functional/test_rx_= gdbsim.py old mode 100644 new mode 100755 similarity index 78% rename from tests/avocado/machine_rx_gdbsim.py rename to tests/functional/test_rx_gdbsim.py index 412a7a5089..ebb8bd5631 --- a/tests/avocado/machine_rx_gdbsim.py +++ b/tests/functional/test_rx_gdbsim.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional test that boots a Linux kernel and checks the console # # Copyright (c) 2018 Red Hat, Inc. @@ -10,11 +12,11 @@ =20 import os =20 -from avocado import skipUnless -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 +from unittest import skipUnless +from qemu_test import QemuSystemTest +from qemu_test import exec_command_and_wait_for_pattern +from qemu_test import wait_for_console_pattern +from qemu_test.utils import gzip_uncompress =20 =20 class RxGdbSimMachine(QemuSystemTest): @@ -27,16 +29,14 @@ class RxGdbSimMachine(QemuSystemTest): def test_uboot(self): """ U-Boot and checks that the console is operational. - - :avocado: tags=3Darch:rx - :avocado: tags=3Dmachine:gdbsim-r5f562n8 - :avocado: tags=3Dendian:little - :avocado: tags=3Dflaky """ + self.set_machine('gdbsim-r5f562n8') + uboot_url =3D ('https://acc.dl.osdn.jp/users/23/23888/u-boot.bin.g= z') uboot_hash =3D '9b78dbd43b40b2526848c0b1ce9de02c24f4dcdb' - uboot_path =3D self.fetch_asset(uboot_url, asset_hash=3Duboot_hash) - uboot_path =3D archive.uncompress(uboot_path, self.workdir) + uboot_path_gz =3D self.fetch_asset(uboot_url, asset_hash=3Duboot_h= ash) + uboot_path =3D os.path.join(self.workdir, 'u-boot.bin') + gzip_uncompress(uboot_path_gz, uboot_path) =20 self.vm.set_console() self.vm.add_args('-bios', uboot_path, @@ -53,12 +53,9 @@ def test_uboot(self): def test_linux_sash(self): """ Boots a Linux kernel and checks that the console is operational. - - :avocado: tags=3Darch:rx - :avocado: tags=3Dmachine:gdbsim-r5f562n7 - :avocado: tags=3Dendian:little - :avocado: tags=3Dflaky """ + self.set_machine('gdbsim-r5f562n7') + dtb_url =3D ('https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb') dtb_hash =3D '7b4e4e2c71905da44e86ce47adee2210b026ac18' dtb_path =3D self.fetch_asset(dtb_url, asset_hash=3Ddtb_hash) @@ -75,3 +72,6 @@ def test_linux_sash(self): wait_for_console_pattern(self, 'Sash command shell (version 1.1.1)= ', failure_message=3D'Kernel panic - not syn= cing') exec_command_and_wait_for_pattern(self, 'printenv', 'TERM=3Dlinux') + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.45.2