From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:504:3c0d:b0:1be9:327d:8ee3 with SMTP id y13csp546565nji; Wed, 16 Oct 2024 02:31:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpAVTBo0yAPtpzjo7aDFYTYZ45oYwRJvcxG+XjUzaWB9yzc2eVrLuECr2aysLZ+WNaziWCeRzhWvFs8A==@linaro.org X-Google-Smtp-Source: AGHT+IFhw7Ydxfll76p1Bcy4G6e8BOd+70cxzw7AsWMiPFMsAl0QQHfal4LQ9mhECf7w79BxznAx X-Received: by 2002:a05:620a:460b:b0:7a7:dcdf:560b with SMTP id af79cd13be357-7b11a34b9b5mr2356616485a.3.1729071084140; Wed, 16 Oct 2024 02:31:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729071084; cv=none; d=google.com; s=arc-20240605; b=KuU1mLH2tdpLNGlqIPR/QAAV/K7G5I4yN7kHVgI6DRbOe6bH9XWPuSsMczsHnTd7YL 6YS3hnJha/pH9ADUxxnjPt5CrUEqUmCemnN/aYKw96t4+2XDjrAorUs+TVLJEsiPNuXI t31+eqIYVdxRee2u7pftwAcfxegk+960FPOXGmq/YwpKa6YikvefCoQnqKdbneVZBwd4 6o1Q3VT7T9VClfj6W6Y1lLP5i+aHy1/z+wYABJPQCHvZyvPhPkZNTzPbn9RxiIitIdln GESNXxMoCXnYBuz9HjqgFx3lBQfsctv6OZs0DX2jxpdnHff0OxeOq6YXtNaKuuEdo+eH I67g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:user-agent :in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=DHSIvXqPAfmaUCm9uydRM3LXJx5OOQFCrvQmnAkDaR8=; fh=xKd4yQm9r0Lk+nEGdjBpHbpQIcW2sX7B+h4Xb8fmgKg=; b=a3vk9m8tm+8TJdsY4lOSoww9bZSXGNKb8zX92m6LQh+orhESsMbkFDjyEXoSiHMU1W 8ON/JlHqC1RyH6MRhM2DU3zIcypSaLYz1H6PJ+P/xkWbBy6JV5ozts+tTyrNv5ITfxUa UEQjUzE/YeI01w5V22iQYbqqOfFtIe40IkOuYfQ7pfGgrcqDEBAGVEfiDwcDNwTmEazh VJtSQeBVB0zluxlhwoKKdCZi/SoYSlaWN2N7kPCKm8iRk3jBeLML+h7dBy3Gwprl9jOr vJj5dVZJ3cHm46PN2WFNyuUrzKjPOVQQFPrKG0brf4AqNpnaLzjZSTpebcJhrIS+WnZW TwoA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=grSZbRAD; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b1363efa13si332481385a.591.2024.10.16.02.31.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Oct 2024 02:31:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=grSZbRAD; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t10Mw-0006Vd-Pb; Wed, 16 Oct 2024 05:31:02 -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 1t10Mv-0006VF-QU for qemu-arm@nongnu.org; Wed, 16 Oct 2024 05:31:01 -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 1t10Mu-0002d7-4M for qemu-arm@nongnu.org; Wed, 16 Oct 2024 05:31:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729071059; h=from:from:reply-to: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=DHSIvXqPAfmaUCm9uydRM3LXJx5OOQFCrvQmnAkDaR8=; b=grSZbRADr3TjOv/pj20AIOH0ov++5jPBYlN+nTiCtCYVTBLmYjg+OZDrh6iLrj4JBaCHV0 kEVBRfU6klaWpVuRD71uBffbjdOv8Vgn0AcURAO7xG2KN71GN1u33yxqmiKQPJvNV8Lc1Y I3AvDLXcu9hEfpAN2nN0xxjGCGeT0Ao= Received: from mx-prod-mc-03.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-241-XRGil9cnMwSjfpKZPos3GQ-1; Wed, 16 Oct 2024 05:30:53 -0400 X-MC-Unique: XRGil9cnMwSjfpKZPos3GQ-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C988F19560B1; Wed, 16 Oct 2024 09:30:50 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.95]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B927F30001A6; Wed, 16 Oct 2024 09:30:44 +0000 (UTC) Date: Wed, 16 Oct 2024 10:30:40 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: =?utf-8?Q?C=C3=A9dric?= Le Goater Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, Peter Maydell , Steven Lee , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley , Thomas Huth , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Subject: Re: [PATCH] tests/functional: Convert most Aspeed machine tests Message-ID: References: <20241016090741.2026630-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20241016090741.2026630-1-clg@redhat.com> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.063, 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: A7EUNzRgPW6i On Wed, Oct 16, 2024 at 11:07:41AM +0200, Cédric Le Goater wrote: > This is a simple conversion of the tests with some cleanups and > adjustments to match the new test framework. Replace the zephyr image > MD5 hashes with SHA256 hashes while at it. > > The SDK tests depend on a ssh class from avocado.utils which is > difficult to replace. To be addressed separately. > > Signed-off-by: Cédric Le Goater > --- > tests/avocado/machine_aspeed.py | 252 -------------------------- > tests/functional/meson.build | 2 + > tests/functional/test_arm_aspeed.py | 269 ++++++++++++++++++++++++++++ > 3 files changed, 271 insertions(+), 252 deletions(-) > create mode 100644 tests/functional/test_arm_aspeed.py > > diff --git a/tests/functional/test_arm_aspeed.py b/tests/functional/test_arm_aspeed.py > new file mode 100644 > index 000000000000..2f9a90f64d8f > --- /dev/null > +++ b/tests/functional/test_arm_aspeed.py > @@ -0,0 +1,269 @@ > +#!/usr/bin/env python3 > +# > +# Functional test that boots the ASPEED SoCs with firmware > +# > +# Copyright (C) 2022 ASPEED Technology Inc > +# > +# SPDX-License-Identifier: GPL-2.0-or-later > + > +import os > +import time > +import subprocess > +import tempfile > + > +from qemu_test import QemuSystemTest, Asset > +from qemu_test import wait_for_console_pattern > +from qemu_test import exec_command_and_wait_for_pattern > +from qemu_test import interrupt_interactive_console_until_pattern > +from qemu_test import exec_command > +from qemu_test import has_cmd > +from qemu_test.utils import archive_extract > +from zipfile import ZipFile > +from unittest import skipUnless > + > +class AST1030Machine(QemuSystemTest): > + > + def test_ast1030_zephyros_1_04(self): > + asset_url = Asset( > + ('https://github.com/AspeedTech-BMC' > + '/zephyr/releases/download/v00.01.04/ast1030-evb-demo.zip'), > + '4ac6210adcbc61294927918707c6762483fd844dde5e07f3ba834ad1f91434d3') Don't instantiate assets inline to test code, as this makes them invisible to the logic that pre-downloads assets prior to running tests. As a result you're liable to have test timeouts if the on-the-fly asset download takes too long. Instead You should use a class level varible with an "ASSET_" name prefix eg ASSET_ = Asset(....) See other converted tests for examples of the pattern. > + kernel_name = "ast1030-evb-demo/zephyr.elf" > + zip_file = asset_url.fetch() > + with ZipFile(zip_file, 'r') as zf: > + zf.extract(kernel_name, path=self.workdir) > + kernel_file = os.path.join(self.workdir, kernel_name) > + > + self.set_machine('ast1030-evb') > + self.vm.set_console() > + self.vm.add_args('-kernel', kernel_file, '-nographic') > + self.vm.launch() > + wait_for_console_pattern(self, "Booting Zephyr OS") > + exec_command_and_wait_for_pattern(self, "help", > + "Available commands") > + With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|