From nobody Sun Apr 6 20:58:31 2025 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=1735813953; cv=none; d=zohomail.com; s=zohoarc; b=Kuwp8/krE8a20O7ckqme1mo+gMluCLTNH7pzDfWxSG1wuH+8koKDZQYK03GtzKm7+UNJdPBpp3/Hu2pDvVnvyrHxDRA0Qm2v22rTFVpcbZpVPrXVFPIO4CU0rndW6KFSTPSibwJhoblR8E0eLpPeOGqdrsLH850uEJCVC47cupU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735813953; 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=PdoFGzpKPE2v7Mm/DVn9OSeyb/ZaVQO5qXic5s3GVNI=; b=cU8dt3miiKmdKtBFi9mFPow4dXqJiqSMNBWuC9WEgDVkG+3DCbifxBLE/LzvDLdDvl5cqpCZO+vEcS7qZtkC1vrLLO0JYzhQ/hfxAOYjiToeuOgQFDNsNSUxiKVd7zuP8P7dHB9VkSy/dagQE24z88YQP3N3ewuWXVUaKtA7o+Q= 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 1735813952882619.039569895298; Thu, 2 Jan 2025 02:32:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUd-0003qW-NO; Thu, 02 Jan 2025 05:31:55 -0500 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 1tTIUc-0003qF-53 for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:54 -0500 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 1tTIUa-0005pl-Lj for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:53 -0500 Received: from mx-prod-mc-04.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-551-okjxB34SOmexIrEktq0Bzw-1; Thu, 02 Jan 2025 05:31:49 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EDF3E19560AB; Thu, 2 Jan 2025 10:31:47 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E394B1956052; Thu, 2 Jan 2025 10:31:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813911; 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=PdoFGzpKPE2v7Mm/DVn9OSeyb/ZaVQO5qXic5s3GVNI=; b=AMBYdy9VYMAi5qDJABJY4T5bnVhdKau4E1crQjTQbNI0J30tVCuGS4NeE5YH3r4Qrg7Ws5 JEreF42TlPa61eSlNQ9/hxGAPYlMVJBWtiZEjZO5Rf+QTaDGNVdcy6BvZvIyxK7q3UeA30 qkF4dN16MA8QDVHy4yGqNDfngtQqk6c= X-MC-Unique: okjxB34SOmexIrEktq0Bzw-1 X-Mimecast-MFC-AGG-ID: okjxB34SOmexIrEktq0Bzw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Ani Sinha , peter.maydell@linaro.org, qemu-trivial@nongnu.org Subject: [PULL 01/10] docs: update copyright date to the year 2025 Date: Thu, 2 Jan 2025 11:31:29 +0100 Message-ID: <20250102103138.354618-2-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735813955583019100 Content-Type: text/plain; charset="utf-8" From: Ani Sinha We are already in January 2025! Update copyright notices. Cc: peter.maydell@linaro.org Cc: qemu-trivial@nongnu.org Signed-off-by: Ani Sinha Message-ID: <20250101080116.1050336-1-anisinha@redhat.com> Signed-off-by: Thomas Huth --- docs/conf.py | 2 +- include/qemu/help-texts.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 164a8ee8b2..31bb9a3789 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -87,7 +87,7 @@ =20 # General information about the project. project =3D u'QEMU' -copyright =3D u'2024, The QEMU Project Developers' +copyright =3D u'2025, The QEMU Project Developers' author =3D u'The QEMU Project Developers' =20 # The version info for the project you're documenting, acts as replacement= for diff --git a/include/qemu/help-texts.h b/include/qemu/help-texts.h index 353ab2ad8b..bc8fab9169 100644 --- a/include/qemu/help-texts.h +++ b/include/qemu/help-texts.h @@ -2,7 +2,7 @@ #define QEMU_HELP_TEXTS_H =20 /* Copyright string for -version arguments, About dialogs, etc */ -#define QEMU_COPYRIGHT "Copyright (c) 2003-2024 " \ +#define QEMU_COPYRIGHT "Copyright (c) 2003-2025 " \ "Fabrice Bellard and the QEMU Project developers" =20 /* Bug reporting information for --help arguments, About dialogs, etc */ --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814023; cv=none; d=zohomail.com; s=zohoarc; b=M0PLxJsrv/EyqRX0Ht31bZ3Y79+mV6QAjm17LRXjuIVtYC62rmuxLy1fn+wkSWbjxkSWGswewziUAwOeqFrHQtENbZY3fExVVpbdsoK2lBWeHs8/7ftbSy+My1HYOcHVOi39ecFLjEq6UI2fHJjbxTw4nFvW0n7R8oXGnXrtzJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814023; 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=LK0S0IuerEGTJFmy4ic3tbp1RUOOryJ8GJPBNekE0cg=; b=bDihuRr1Fbab5s0DqfxBeQTlpeCCvRxEGE3pNeyMlOWWmzmS2Z8Ww7quw2E1L2GjZp9kWwDA3SzY9m3RF0eOiaetE93cRuqeYSLYvG+fBi0LDj71WeyONeZO3ZCnEokDMA4416Rx5Mt8yF2Mj+xl47fJWJzfbhJ4SZJUcZqDi1o= 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 1735814023861208.1666972020979; Thu, 2 Jan 2025 02:33:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUg-0003rU-Gt; Thu, 02 Jan 2025 05:31:58 -0500 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 1tTIUf-0003rA-FP for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:57 -0500 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 1tTIUe-0005qL-0d for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:57 -0500 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-135-OjTMktBqOFmp2p0kvAx16Q-1; Thu, 02 Jan 2025 05:31:51 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 453D6195608B; Thu, 2 Jan 2025 10:31:50 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A9E941956056; Thu, 2 Jan 2025 10:31:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813915; 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=LK0S0IuerEGTJFmy4ic3tbp1RUOOryJ8GJPBNekE0cg=; b=GQr5Cd29o9odXSwocj6WWdwes2IWqMIODWKJFemKlwO655kIKBH/dHCYq79k4kfONejFad EEO/A5+K83Laz9TSbhkWzKRCfJX+73lQ7E5wlP6Vg/5WBO2vRmRfmLSRR+NLimS7TBrN+j ULX4IbpvYvoyCH7OAOLGCv7xodwsOEE= X-MC-Unique: OjTMktBqOFmp2p0kvAx16Q-1 X-Mimecast-MFC-AGG-ID: OjTMktBqOFmp2p0kvAx16Q From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 02/10] tests/functional: Convert the vnc test Date: Thu, 2 Jan 2025 11:31:30 +0100 Message-ID: <20250102103138.354618-3-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-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.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814025536019100 Nothing thrilling in here, it's just a straight forward conversion. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20241218131439.255841-2-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/functional/meson.build | 1 + tests/{avocado/vnc.py =3D> functional/test_vnc.py} | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) rename tests/{avocado/vnc.py =3D> functional/test_vnc.py} (97%) mode change 100644 =3D> 100755 diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 24f7f8f2f1..a5087fcb34 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -224,6 +224,7 @@ tests_x86_64_system_quick =3D [ 'pc_cpu_hotplug_props', 'virtio_version', 'x86_cpu_model_versions', + 'vnc', ] =20 tests_x86_64_system_thorough =3D [ diff --git a/tests/avocado/vnc.py b/tests/functional/test_vnc.py old mode 100644 new mode 100755 similarity index 97% rename from tests/avocado/vnc.py rename to tests/functional/test_vnc.py index 862c8996a8..b769d3b268 --- a/tests/avocado/vnc.py +++ b/tests/functional/test_vnc.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Simple functional tests for VNC functionality # # Copyright (c) 2018 Red Hat, Inc. @@ -11,7 +13,7 @@ import socket from typing import List =20 -from avocado_qemu import QemuSystemTest +from qemu_test import QemuSystemTest =20 =20 VNC_ADDR =3D '127.0.0.1' @@ -51,10 +53,7 @@ def find_free_ports(count: int) -> List[int]: =20 =20 class Vnc(QemuSystemTest): - """ - :avocado: tags=3Dvnc,quick - :avocado: tags=3Dmachine:none - """ + def test_no_vnc(self): self.vm.add_args('-nodefaults', '-S') self.vm.launch() @@ -113,3 +112,6 @@ def test_change_listen(self): self.assertFalse(check_connect(a)) self.assertTrue(check_connect(b)) self.assertTrue(check_connect(c)) + +if __name__ =3D=3D '__main__': + QemuSystemTest.main() --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814020; cv=none; d=zohomail.com; s=zohoarc; b=kTLL+h2KB+IPeKIcid/yES7HFMTlz5xdjpOcldz2hpqJ8RPfsbvjq4n477WVgN6gZwjIADBjnk12HiQnXIp+1CuMqMsk/PYkDHivh89FGaAB7OZMDmLmvneVSWDBZpJFqNFlm7izMFlRliLUnOz4oIWV3USL83T8nmuFuwEmLMU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814020; 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=gP3n+xmGEu7VSzd7bF6ZEXq02fd+LK2FuyJYFdeOJd0=; b=TzpIiqBv+9v3oPdzXpM6/yBSYA2Ys6pX/PGbnwq2nxTTMzNPzuZU2SfY4wVVnUOJz1nwEvx+vubWR6XDi2vtgUERmy9cIsDhSgAaO4O25N2qlT+CaDKDfaWdnz0ldeiVvhYCVy+4YbH+ML/DiyvvN4Gy4tzJttbsBmslTNiJC2c= 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 1735814020039501.81913364555305; Thu, 2 Jan 2025 02:33:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUg-0003rQ-AZ; Thu, 02 Jan 2025 05:31:58 -0500 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 1tTIUf-0003r9-EJ for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:57 -0500 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 1tTIUd-0005qF-VB for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:57 -0500 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-107-CgwbuEo3PUuwnOgGEWkJcw-1; Thu, 02 Jan 2025 05:31:52 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 0B32E19560BA for ; Thu, 2 Jan 2025 10:31:52 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D1DD81956052; Thu, 2 Jan 2025 10:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813915; 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=gP3n+xmGEu7VSzd7bF6ZEXq02fd+LK2FuyJYFdeOJd0=; b=cg9KcpjNzMgtI9flqxU1L2HGUWHbhl88cDzUFmMwu1Hx1BbnMZ4S9EELzLvUld0sJH47hp 0aToYvnrxQYYrC6yhPdIzFlt680ex4D5h+jX86lmzvCSl9YorTBjbdjFYvsVNr05fkxuX6 CsGVN4QW4QljwlMKzNUQHDiJxLEtlKw= X-MC-Unique: CgwbuEo3PUuwnOgGEWkJcw-1 X-Mimecast-MFC-AGG-ID: CgwbuEo3PUuwnOgGEWkJcw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 03/10] tests/functional/test_vnc: Do not use a hard-coded VNC port Date: Thu, 2 Jan 2025 11:31:31 +0100 Message-ID: <20250102103138.354618-4-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814021312019100 Content-Type: text/plain; charset="utf-8" Two tests here are using the hard-coded VNC port :0 ... if there is already a QEMU or other program running that is using this port, the tests will be failing. Fortunately, QEMU can also auto-detect a free port with the "to=3D..." parameter, so let's use that for the tests to avoid the problem. Message-ID: <20241218131439.255841-4-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/functional/test_vnc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_vnc.py b/tests/functional/test_vnc.py index b769d3b268..e6328567c7 100755 --- a/tests/functional/test_vnc.py +++ b/tests/functional/test_vnc.py @@ -72,7 +72,7 @@ def test_no_vnc_change_password(self): 'Could not set password') =20 def test_change_password_requires_a_password(self): - self.vm.add_args('-nodefaults', '-S', '-vnc', ':0') + self.vm.add_args('-nodefaults', '-S', '-vnc', ':1,to=3D999') self.vm.launch() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) set_password_response =3D self.vm.qmp('change-vnc-password', @@ -84,7 +84,7 @@ def test_change_password_requires_a_password(self): 'Could not set password') =20 def test_change_password(self): - self.vm.add_args('-nodefaults', '-S', '-vnc', ':0,password=3Don') + self.vm.add_args('-nodefaults', '-S', '-vnc', ':1,to=3D999,passwor= d=3Don') self.vm.launch() self.assertTrue(self.vm.qmp('query-vnc')['return']['enabled']) self.vm.cmd('change-vnc-password', --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814009; cv=none; d=zohomail.com; s=zohoarc; b=GmwWAKHQxAv0VrBa+ihwbFzxNVBBtLTl7DdGqTTfqqL2imcu91y5WapE4HEPEEUfnshyZecv6q96eFSNSQUF1ishNFIVXaFCMIvMb6LNH/lhdhKeWzL6JHkrTnW/mCJ+wNqycd/4qHQdEiekRs1jCLeMfFCmGjMnB6yRXBdbVao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814009; 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=FG8z3uAkvjcDc1Etm1L/rQEGwaQzrKgc/SEFFM2hTsM=; b=WFy7AaimWDdA51eg9Xq2sHADf7Q/paHIxh/SEbqw5Es08PR3QixZxrAO5IOmRu9G3oqApUo2PUkWwhyD5aggtulazu+C9goM1IcmN542/PFneRty8Z+YBXKnfiHYyS4FJH6FHmZ2dx0z8DkIj2Y8SxYoDJ8aPbdcIl7LkCN97j8= 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 1735814009246222.004890956498; Thu, 2 Jan 2025 02:33:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUj-0003sK-7q; Thu, 02 Jan 2025 05:32:01 -0500 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 1tTIUh-0003rx-TJ for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:59 -0500 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 1tTIUg-0005qh-I0 for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:31:59 -0500 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-81-jRsnUBvUPjyJm99eMsnRwA-1; Thu, 02 Jan 2025 05:31:56 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 9CD4A19560AA for ; Thu, 2 Jan 2025 10:31:55 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C17111956052; Thu, 2 Jan 2025 10:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813917; 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=FG8z3uAkvjcDc1Etm1L/rQEGwaQzrKgc/SEFFM2hTsM=; b=H7B8sCClsGl51mImpQSWQyya+vUBYwUreThVpU3jeyVhQUGXe4RZ7TDJ99ktPDnj1Tt7RP 0zJHgLxXw3NUnC/Y/LV7CLLp+Xe8L4J4STqY4XIQqruWRV+BZGWD0UvP88LQpjh77ALKNq 1q6400J4SzN8kOr2BKvSs1a019RIaRI= X-MC-Unique: jRsnUBvUPjyJm99eMsnRwA-1 X-Mimecast-MFC-AGG-ID: jRsnUBvUPjyJm99eMsnRwA From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 04/10] tests/functional/test_vnc: Remove the test_no_vnc test Date: Thu, 2 Jan 2025 11:31:32 +0100 Message-ID: <20250102103138.354618-5-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-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.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814011414019100 This test matches exactly the first three lines of the following test_no_vnc_change_password test, so there is exactly zero additional test coverage in here. Reviewed-by: Daniel P. Berrang=C3=A9 Message-ID: <20241218131439.255841-3-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/functional/test_vnc.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/functional/test_vnc.py b/tests/functional/test_vnc.py index e6328567c7..e600d75234 100755 --- a/tests/functional/test_vnc.py +++ b/tests/functional/test_vnc.py @@ -54,11 +54,6 @@ def find_free_ports(count: int) -> List[int]: =20 class Vnc(QemuSystemTest): =20 - def test_no_vnc(self): - self.vm.add_args('-nodefaults', '-S') - self.vm.launch() - self.assertFalse(self.vm.qmp('query-vnc')['return']['enabled']) - def test_no_vnc_change_password(self): self.vm.add_args('-nodefaults', '-S') self.vm.launch() --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814024; cv=none; d=zohomail.com; s=zohoarc; b=dgzcoVEb1d9Uc1nKBLlooxE+JgY8eXk7SeFoN259WCbG10v3+sBlLix44ujkQ/vQdTtMAH/Cn6ceOGzDYdjrJOHrEwreKr5Fk1dy0rKolGC84QVJ9m+lajcqvi4CBJ14iCkue1EoaiYAYKf2h/SeArNFsIBCEfvRO9CdtuPgwhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814024; 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=2rHxQa1PhAoahuKgtDYSw/InvDF8l5Ykbk+lLRlrRRo=; b=TI2Kzhqutt0RDUFpRq4DwkBZdlQal+sOft5IUTPOshMmEuNxPqcLU8JaP95zwDbpDrr4LlRJjBUCjI8ZwN8gYTd8RJ+csnhz/IyNfOX47TnFGyMvyDoheI0VVkjKbzU8FtIISQeFFZSOFn0YPQRDCMVzDKZzjOW3VCYBV+vzZwY= 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 1735814024223581.7471766056705; Thu, 2 Jan 2025 02:33:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUp-0003tr-9Z; Thu, 02 Jan 2025 05:32:07 -0500 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 1tTIUn-0003tC-AA for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTIUl-0005rB-GW for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:05 -0500 Received: from mx-prod-mc-04.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-364-shSA59nFPhm9eKC6_LCR2w-1; Thu, 02 Jan 2025 05:31:59 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3301F19560A3 for ; Thu, 2 Jan 2025 10:31:58 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 989891956052; Thu, 2 Jan 2025 10:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813922; 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=2rHxQa1PhAoahuKgtDYSw/InvDF8l5Ykbk+lLRlrRRo=; b=f0KNnKXMHgIK3uBxqxyx8bpO1HICIaC6gGs6HUJ9UNRIE/NYI06JFSblwiNZcTyKE2rpjD gZAkPQT/2tLdPBKt/X13xPY1fB0C5jMXulsG2YbWZ897GbrlSVrTAkWhuGlC9/VG18M2ns yTYiRiVG5RtjzsMgQ93PLhk3SEadM6A= X-MC-Unique: shSA59nFPhm9eKC6_LCR2w-1 X-Mimecast-MFC-AGG-ID: shSA59nFPhm9eKC6_LCR2w From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi Subject: [PULL 05/10] tests/functional: Extract the find_free_ports() function into a helper file Date: Thu, 2 Jan 2025 11:31:33 +0100 Message-ID: <20250102103138.354618-6-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814025529019100 Content-Type: text/plain; charset="utf-8" We'll need this functionality in other functional tests, too, so let's extract it into the qemu_test module. Also add an __enter__ and __exit__ function that can be used for using this functionality in a locked context, so that tests that are running in parallel don't try to compete for the same ports later. Also make sure to only use ports in the "Dynamic Ports" range (see https://www.rfc-editor.org/rfc/rfc6335) and "randomize" the start of the probed range with the PID of the test process to further avoid possible clashes with other competing processes. Message-ID: <20241218131439.255841-5-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/functional/qemu_test/ports.py | 56 +++++++++++++++++++++++++++++ tests/functional/test_vnc.py | 36 +++++-------------- 2 files changed, 64 insertions(+), 28 deletions(-) create mode 100644 tests/functional/qemu_test/ports.py diff --git a/tests/functional/qemu_test/ports.py b/tests/functional/qemu_te= st/ports.py new file mode 100644 index 0000000000..cc39939d48 --- /dev/null +++ b/tests/functional/qemu_test/ports.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python3 +# +# Simple functional tests for VNC functionality +# +# Copyright 2018, 2024 Red Hat, Inc. +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +import fcntl +import os +import socket +import sys +import tempfile + +from .config import BUILD_DIR +from typing import List + +class Ports(): + + PORTS_ADDR =3D '127.0.0.1' + PORTS_RANGE_SIZE =3D 1024 + PORTS_START =3D 49152 + ((os.getpid() * PORTS_RANGE_SIZE) % 16384) + PORTS_END =3D PORTS_START + PORTS_RANGE_SIZE + + def __enter__(self): + lock_file =3D os.path.join(BUILD_DIR, "tests", "functional", "port= _lock") + self.lock_fh =3D os.open(lock_file, os.O_CREAT) + fcntl.flock(self.lock_fh, fcntl.LOCK_EX) + return self + + def __exit__(self, exc_type, exc_value, traceback): + fcntl.flock(self.lock_fh, fcntl.LOCK_UN) + os.close(self.lock_fh) + + def check_bind(self, port: int) -> bool: + with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: + try: + sock.bind((self.PORTS_ADDR, port)) + except OSError: + return False + + return True + + def find_free_ports(self, count: int) -> List[int]: + result =3D [] + for port in range(self.PORTS_START, self.PORTS_END): + if self.check_bind(port): + result.append(port) + if len(result) >=3D count: + break + assert len(result) =3D=3D count + return result + + def find_free_port(self) -> int: + return self.find_free_ports(1)[0] diff --git a/tests/functional/test_vnc.py b/tests/functional/test_vnc.py index e600d75234..1916be0103 100755 --- a/tests/functional/test_vnc.py +++ b/tests/functional/test_vnc.py @@ -14,22 +14,9 @@ from typing import List =20 from qemu_test import QemuSystemTest - +from qemu_test.ports import Ports =20 VNC_ADDR =3D '127.0.0.1' -VNC_PORT_START =3D 32768 -VNC_PORT_END =3D VNC_PORT_START + 1024 - - -def check_bind(port: int) -> bool: - with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: - try: - sock.bind((VNC_ADDR, port)) - except OSError: - return False - - return True - =20 def check_connect(port: int) -> bool: with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock: @@ -40,18 +27,6 @@ def check_connect(port: int) -> bool: =20 return True =20 - -def find_free_ports(count: int) -> List[int]: - result =3D [] - for port in range(VNC_PORT_START, VNC_PORT_END): - if check_bind(port): - result.append(port) - if len(result) >=3D count: - break - assert len(result) =3D=3D count - return result - - class Vnc(QemuSystemTest): =20 def test_no_vnc_change_password(self): @@ -85,8 +60,7 @@ def test_change_password(self): self.vm.cmd('change-vnc-password', password=3D'new_password') =20 - def test_change_listen(self): - a, b, c =3D find_free_ports(3) + def do_test_change_listen(self, a, b, c): self.assertFalse(check_connect(a)) self.assertFalse(check_connect(b)) self.assertFalse(check_connect(c)) @@ -108,5 +82,11 @@ def test_change_listen(self): self.assertTrue(check_connect(b)) self.assertTrue(check_connect(c)) =20 + def test_change_listen(self): + with Ports() as ports: + a, b, c =3D ports.find_free_ports(3) + self.do_test_change_listen(a, b, c) + + if __name__ =3D=3D '__main__': QemuSystemTest.main() --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814006; cv=none; d=zohomail.com; s=zohoarc; b=OlSH7SfnMvNU4z0MqEqxV9Jtpv1ziEjAAS8wi5v8flkzPH/lQSm2AkF87PTw4KFTpm3y4kGwydm3hF6W9E9ju7mbOs1DqgKj6ZB+zfEJ8/0YItjxXZhDv/SiPwknhwI0VPf6YZQzZg9rMz1iSuVjXqQxvhWZOisYs9+7cQVH4R8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814006; 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=AtKOIMrUMfJqVHlazx3ZHIz+8kmTp7dRf5Y0+BdIZT0=; b=KQVvivJNxUFmFMc+ZHrArAkYHk+Si0JzwYAkEn4mlWt/QtdHujGbK0ymDeYHhtQ3XapFrbLHTvNKcXDkAUKq3K5g/IbTYnq8HqnJ8oGoaZ7cMJh++qJvcNJAFSnQw+9u7qhMFAqMwUun4vl3dC6h0O5NZX4jYNXwsXTS+mOY+Ss= 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 1735814006073429.485871810666; Thu, 2 Jan 2025 02:33:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUw-0003ux-3e; Thu, 02 Jan 2025 05:32:14 -0500 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 1tTIUu-0003u8-8r for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTIUs-0005rQ-Hx for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:12 -0500 Received: from mx-prod-mc-05.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-244-KERX274yNE6Yx470rFcdyw-1; Thu, 02 Jan 2025 05:32:02 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A82A01956088; Thu, 2 Jan 2025 10:32:01 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2D28A1956052; Thu, 2 Jan 2025 10:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813929; 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=AtKOIMrUMfJqVHlazx3ZHIz+8kmTp7dRf5Y0+BdIZT0=; b=RO7H/f8OEItEyC6pqTMsAipMabxoPyqWxo82IJePjg/RqlEKG9BHoY4BML+z239jyVO9G4 2fv1NLShypbnZ9HeQYenoMp/sGmBgcD5Dv4R/K7Fy+chZo8BqWz+ycongY40EC6jmLM1Br oiBlg9fYYVoAXIyTYzQGRMugjI3WV9c= X-MC-Unique: KERX274yNE6Yx470rFcdyw-1 X-Mimecast-MFC-AGG-ID: KERX274yNE6Yx470rFcdyw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Nicholas Piggin Subject: [PULL 06/10] tests/functional/test_ppc64_hv: Simplify console handling Date: Thu, 2 Jan 2025 11:31:34 +0100 Message-ID: <20250102103138.354618-7-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814007352019100 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Since functional tests have character-based console output parsing, there is no need for strange hacks to work around old line-based. Signed-off-by: Nicholas Piggin Message-ID: <20241220024617.1968556-3-npiggin@gmail.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/functional/test_ppc64_hv.py | 43 ++++++++++++++----------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc6= 4_hv.py index 037dfdf87e..2182a68c91 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -12,6 +12,7 @@ from qemu_test import QemuSystemTest, Asset from qemu_test import wait_for_console_pattern, exec_command from qemu_test import skipIfMissingCommands, skipBigDataTest +from qemu_test import exec_command_and_wait_for_pattern import os import time import subprocess @@ -73,31 +74,28 @@ def do_start_alpine(self): "id=3Ddrive0,read-only=3Dtrue") =20 self.vm.launch() - wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') - exec_command(self, 'root') + ps1=3D'localhost:~#' wait_for_console_pattern(self, 'localhost login:') - wait_for_console_pattern(self, 'You may change this message by edi= ting /etc/motd.') + exec_command_and_wait_for_pattern(self, 'root', ps1) # If the time is wrong, SSL certificates can fail. - exec_command(self, 'date -s "' + datetime.utcnow().strftime('%Y-%m= -%d %H:%M:%S' + '"')) - exec_command(self, 'setup-alpine -qe') - wait_for_console_pattern(self, 'Updating repository indexes... don= e.') + exec_command_and_wait_for_pattern(self, 'date -s "' + datetime.utc= now().strftime('%Y-%m-%d %H:%M:%S' + '"'), ps1) + ps1=3D'alpine:~#' + exec_command_and_wait_for_pattern(self, 'setup-alpine -qe', ps1) =20 def do_stop_alpine(self): - exec_command(self, 'poweroff') + exec_command(self, 'echo "TEST ME"') wait_for_console_pattern(self, 'alpine:~#') + exec_command(self, 'poweroff') + wait_for_console_pattern(self, 'reboot: Power down') self.vm.wait() =20 def do_setup_kvm(self): - exec_command(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.1= 8/main > /etc/apk/repositories') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'echo http://dl-cdn.alpinelinux.org/alpine/v3.1= 8/community >> /etc/apk/repositories') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'apk update') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'apk add qemu-system-ppc64') - wait_for_console_pattern(self, 'alpine:~#') - exec_command(self, 'modprobe kvm-hv') - wait_for_console_pattern(self, 'alpine:~#') + ps1=3D'alpine:~#' + exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpine= linux.org/alpine/v3.18/main > /etc/apk/repositories', ps1) + exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpine= linux.org/alpine/v3.18/community >> /etc/apk/repositories', ps1) + exec_command_and_wait_for_pattern(self, 'apk update', ps1) + exec_command_and_wait_for_pattern(self, 'apk add qemu-system-ppc64= ', ps1) + exec_command_and_wait_for_pattern(self, 'modprobe kvm-hv', ps1) =20 # This uses the host's block device as the source file for guest block # device for install media. This is a bit hacky but allows reuse of the @@ -116,15 +114,12 @@ def do_test_kvm(self, hpt=3DFalse): '-kernel /media/nvme0n1/boot/vmlinuz-lts ' '-append \'usbcore.nousb ' + append + '\'') # Alpine 3.18 kernel seems to crash in XHCI USB driver. - wait_for_console_pattern(self, 'Welcome to Alpine Linux 3.18') - exec_command(self, 'root') + ps1=3D'localhost:~#' wait_for_console_pattern(self, 'localhost login:') - wait_for_console_pattern(self, 'You may change this message by edi= ting /etc/motd.') - exec_command(self, 'poweroff >& /dev/null') - wait_for_console_pattern(self, 'localhost:~#') + exec_command_and_wait_for_pattern(self, 'root', ps1) + exec_command(self, 'poweroff') wait_for_console_pattern(self, 'reboot: Power down') - time.sleep(1) - exec_command(self, '') + # Now wait for the host's prompt to come back wait_for_console_pattern(self, 'alpine:~#') =20 def test_hv_pseries(self): --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814015; cv=none; d=zohomail.com; s=zohoarc; b=Y6+bZGqSCOa/QLQ2lHHo9cVGUg1kynQcE/r8tHm7AAroLmZNsrR5pJMSoN1sl4nw+XvnFxEjbFqm1Q0oWgUERRzTz/05f6lfA7X7g6WVJ1SuPuFL7a36x9AamUS2icv63yK5YDNmqGvaNws3u9ugaPhg3SnrRd431+QXynX+VA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814015; 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=GPPa8vdt58GXiSGixVwbRhcXl4KjcGndA41w2wQfI/4=; b=QIv/Yghx0hk8mN8zPmKE6/DNkcvLXvct3Lps+14uIkhs2hhNjftbxMEM6Uh9V5Z0fFWQOCaVIKKZVMERSoqz3k3FTqDLAXmEvCoCf15Ume5SGLHmMGlK1Z3QpQBnOZevY0CBkUCrQHNKWeaL2HKrc/7uatjyvUz8ztETsgGX9nI= 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 1735814015521193.9662651433448; Thu, 2 Jan 2025 02:33:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIUv-0003uS-Jn; Thu, 02 Jan 2025 05:32:13 -0500 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 1tTIUt-0003u0-UX for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:11 -0500 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 1tTIUs-0005rT-Cl for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:11 -0500 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-631-XYsfp3L5NZKwLRSSF2aZjg-1; Thu, 02 Jan 2025 05:32:06 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 179831956087; Thu, 2 Jan 2025 10:32:05 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1E2D11956052; Thu, 2 Jan 2025 10:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813929; 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=GPPa8vdt58GXiSGixVwbRhcXl4KjcGndA41w2wQfI/4=; b=e8wRHdiib5IMTDuV+KXpDubZ1JybNS2WddVEUvY77RF9VWaEByeWHvo3e2X35nYi/fkYFa GDvkrwLpMSxJ8BOBsWwlv7FQAorDm1a7BneOkZennM9f81vtbYYksAY2JPCPoM5VK+3IWO XkIV3O8xvozklu6oxzRw0lYAtyVCX5g= X-MC-Unique: XYsfp3L5NZKwLRSSF2aZjg-1 X-Mimecast-MFC-AGG-ID: XYsfp3L5NZKwLRSSF2aZjg From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Nicholas Piggin Subject: [PULL 07/10] tests/functional/test_ppc64_hv: Update repo management Date: Thu, 2 Jan 2025 11:31:35 +0100 Message-ID: <20250102103138.354618-8-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814017324019100 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin `setup-apkrepos` can be used to set repos rather than open-coding URLs. Signed-off-by: Nicholas Piggin Message-ID: <20241220024617.1968556-4-npiggin@gmail.com> Signed-off-by: Thomas Huth --- tests/functional/test_ppc64_hv.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc6= 4_hv.py index 2182a68c91..e0dffb1f15 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -81,6 +81,10 @@ def do_start_alpine(self): exec_command_and_wait_for_pattern(self, 'date -s "' + datetime.utc= now().strftime('%Y-%m-%d %H:%M:%S' + '"'), ps1) ps1=3D'alpine:~#' exec_command_and_wait_for_pattern(self, 'setup-alpine -qe', ps1) + exec_command_and_wait_for_pattern(self, 'setup-apkrepos -c1', ps1) + exec_command_and_wait_for_pattern(self, 'apk update', ps1) + # Could upgrade here but it usually should not be necessary + # exec_command_and_wait_for_pattern(self, 'apk upgrade --available= ', ps1) =20 def do_stop_alpine(self): exec_command(self, 'echo "TEST ME"') @@ -91,9 +95,6 @@ def do_stop_alpine(self): =20 def do_setup_kvm(self): ps1=3D'alpine:~#' - exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpine= linux.org/alpine/v3.18/main > /etc/apk/repositories', ps1) - exec_command_and_wait_for_pattern(self, 'echo http://dl-cdn.alpine= linux.org/alpine/v3.18/community >> /etc/apk/repositories', ps1) - exec_command_and_wait_for_pattern(self, 'apk update', ps1) exec_command_and_wait_for_pattern(self, 'apk add qemu-system-ppc64= ', ps1) exec_command_and_wait_for_pattern(self, 'modprobe kvm-hv', ps1) =20 --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735813965; cv=none; d=zohomail.com; s=zohoarc; b=nbIg7CkFcoj4kfQIpMpv9f4cmHo9g0pEogoTXXXsQyMUKDY1qbXbRWl6Rnfu4UfBIguOdBJP/cVvg017+j/XaG9e1fFZuRAM72SHAvUhZjg/jwTVhNsjOI6OpLkI2g3IQDrhmcwUU8KHhiGEytvSr7nljhjNaI/BqwoVIO530zA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735813965; 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=56mE7YsbykST1gNfOQXCHhWDoXIPtPc7hWmN3UlNX8A=; b=aAhy3CGqLeF2/+SzIxiVy7wN6nT9kflJbPBRFuOMFRvkVj/6Zz4tWVRGU53xyXbe5GJPqZPIpyrBjACBW2rp5FKCl0V9UmocC21l/kxz+jB3auEUg4AHBnguW1wad6EUF0PLhcMjqI/cmBx4X8PbuulTGy+FZZ6vlDbnCYnYanc= 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 173581396570944.88183900102979; Thu, 2 Jan 2025 02:32:45 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIV0-0003vR-5J; Thu, 02 Jan 2025 05:32:18 -0500 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 1tTIUy-0003vD-Sr for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:16 -0500 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 1tTIUx-0005s2-8w for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:16 -0500 Received: from mx-prod-mc-05.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-635-vCdmhpE_NOSt0iXuY00frw-1; Thu, 02 Jan 2025 05:32:08 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A183D195609F; Thu, 2 Jan 2025 10:32:07 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E2A491956052; Thu, 2 Jan 2025 10:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813934; 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=56mE7YsbykST1gNfOQXCHhWDoXIPtPc7hWmN3UlNX8A=; b=StE5TW7i7KyrH4ti5URwoFvUJ1+JFJH68MIDluHLrWOnMGT74TI/DXWbvrQIEvRq4Er+VJ cpRqvzqIj8upjIjmh29+EPSIEwZpaUG3VbrcGhTC9Nn4CV1PP29GO4ItoVRtsqcQxc4VH5 3ez3h6fLjzQRIAKE/dzIPnKXysa/L5E= X-MC-Unique: vCdmhpE_NOSt0iXuY00frw-1 X-Mimecast-MFC-AGG-ID: vCdmhpE_NOSt0iXuY00frw From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Nicholas Piggin Subject: [PULL 08/10] tests/functional/test_ppc64_hv: Update to Alpine 3.21.0 Date: Thu, 2 Jan 2025 11:31:36 +0100 Message-ID: <20250102103138.354618-9-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735813967276019100 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Signed-off-by: Nicholas Piggin Message-ID: <20241220024617.1968556-5-npiggin@gmail.com> Signed-off-by: Thomas Huth --- tests/functional/test_ppc64_hv.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/functional/test_ppc64_hv.py b/tests/functional/test_ppc6= 4_hv.py index e0dffb1f15..62f996adf6 100755 --- a/tests/functional/test_ppc64_hv.py +++ b/tests/functional/test_ppc64_hv.py @@ -35,9 +35,9 @@ class HypervisorTest(QemuSystemTest): 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') + ('https://dl-cdn.alpinelinux.org/alpine/v3.21/' + 'releases/ppc64le/alpine-standard-3.21.0-ppc64le.iso'), + '7651ab4e3027604535c0b36e86c901b4695bf8fe97b908f5b48590f6baae8f30') =20 def extract_from_iso(self, iso, path): """ @@ -114,7 +114,7 @@ def do_test_kvm(self, hpt=3DFalse): '-initrd /media/nvme0n1/boot/initramfs-lts ' '-kernel /media/nvme0n1/boot/vmlinuz-lts ' '-append \'usbcore.nousb ' + append + '\'') - # Alpine 3.18 kernel seems to crash in XHCI USB driver. + # Alpine 3.21 kernel seems to crash in XHCI USB driver. ps1=3D'localhost:~#' wait_for_console_pattern(self, 'localhost login:') exec_command_and_wait_for_pattern(self, 'root', ps1) --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814012; cv=none; d=zohomail.com; s=zohoarc; b=lmOIeoaRBWdo8iDSsX5Af3uu+gXHUXUfsoidBmj3aIZAuc/I06vJR50NC1dyjzJeKZhNPEY86fC/o9ZviBaGIGwRX/Dw3yYUb9853CuMVRSrRp4OYh9LwgWkgojqMPxiSCGOJqFWCC1m3y7suhNbjdKU8IACKyNXaYrGaZmeFpM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814012; 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=/FsBQh+sZn2UqlJIcJFsyt2FwXIRTLK+SOb4qwdhihE=; b=ERlxyV5cWpoKBv2AKRgWQxPEA5CcWZpp87fBk62+KeWTCmbsBhiC+gUFo1c9sJ/OII4qi6cKiTlyRVo+Sr1ZJIvqlLlqnYJ/jBCxC7mkbDhKG6jzvO1oesLTKkyv+b6bj1iW+FncGXVIJUH3lg6swTARcgUrbZL4A2pDeCnVPbQ= 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 1735814012972290.6013253684823; Thu, 2 Jan 2025 02:33:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIV5-0003wk-N4; Thu, 02 Jan 2025 05:32:23 -0500 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 1tTIV0-0003vn-P6 for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tTIUx-0005sB-RC for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:18 -0500 Received: from mx-prod-mc-05.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-568-6qXwaS_QOE2NoIbpXbNr7w-1; Thu, 02 Jan 2025 05:32:11 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 830D619560A3; Thu, 2 Jan 2025 10:32:10 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 62D651956052; Thu, 2 Jan 2025 10:32:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813935; 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=/FsBQh+sZn2UqlJIcJFsyt2FwXIRTLK+SOb4qwdhihE=; b=INqDpWvNkd0mIjO5KwwDewyjdTJB96X37l22j3ZG4CnWR2peclNFtm+yjI0nkDegnQAUz/ cpyZWbdE4OgVHfpdX2HDQhU72gecgsx9xV+oRtr3wc4pjwWWxB652+OSQFfqNYc6a+68hW TjRl+QQDTYfGVED2UGMSD6C03Y+0wOk= X-MC-Unique: 6qXwaS_QOE2NoIbpXbNr7w-1 X-Mimecast-MFC-AGG-ID: 6qXwaS_QOE2NoIbpXbNr7w From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yoshinori Sato , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 09/10] tests/functional/test_rx_gdbsim: Use stable URL for test_linux_sash Date: Thu, 2 Jan 2025 11:31:37 +0100 Message-ID: <20250102103138.354618-10-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-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.17 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814013415019100 From: Philippe Mathieu-Daud=C3=A9 Yoshinori said [*] URL references on OSDN were stable, but they appear not to be. Mirror the artifacts on GitHub to avoid failures while testing on CI. [*] https://www.mail-archive.com/qemu-devel@nongnu.org/msg686487.html Cc: Yoshinori Sato Reported-by: Alex Benn=C3=A9e Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20200630202631.7345-1-f4bug@amsat.org> [huth: Adapt the patch to the new version in the functional framework] Message-ID: <20241229083419.180423-1-huth@tuxfamily.org> Signed-off-by: Thomas Huth --- tests/functional/test_rx_gdbsim.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/functional/test_rx_gdbsim.py b/tests/functional/test_rx_= gdbsim.py index 20623aa51c..49245793e1 100755 --- a/tests/functional/test_rx_gdbsim.py +++ b/tests/functional/test_rx_gdbsim.py @@ -21,13 +21,16 @@ class RxGdbSimMachine(QemuSystemTest): KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 ASSET_UBOOT =3D Asset( - 'https://acc.dl.osdn.jp/users/23/23888/u-boot.bin.gz', - '7146567d669e91dbac166384b29aeba1715beb844c8551e904b86831bfd9d046') + ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdb= sim/' + 'u-boot.bin'), + 'dd7dd4220cccf7aeb32227b26233bf39600db05c3f8e26005bcc2bf6c927207d') ASSET_DTB =3D Asset( - 'https://acc.dl.osdn.jp/users/23/23887/rx-virt.dtb', + ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdb= sim/' + 'rx-gdbsim.dtb'), 'aa278d9c1907a4501741d7ee57e7f65c02dd1b3e0323b33c6d4247f1b32cf29a') ASSET_KERNEL =3D Asset( - 'http://acc.dl.osdn.jp/users/23/23845/zImage', + ('https://github.com/philmd/qemu-testing-blob/raw/rx-gdbsim/rx/gdb= sim/' + 'zImage'), 'baa43205e74a7220ed8482188c5e9ce497226712abb7f4e7e4f825ce19ff9656') =20 def test_uboot(self): @@ -36,7 +39,7 @@ def test_uboot(self): """ self.set_machine('gdbsim-r5f562n8') =20 - uboot_path =3D self.uncompress(self.ASSET_UBOOT) + uboot_path =3D self.ASSET_UBOOT.fetch() =20 self.vm.set_console() self.vm.add_args('-bios', uboot_path, --=20 2.47.1 From nobody Sun Apr 6 20:58:31 2025 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=1735814003; cv=none; d=zohomail.com; s=zohoarc; b=bYa6ohFrApt6lXmHJ9tfkxBLpbKAGnvAwKHexETcH9NMnOm3op1cBB331tGawX7q+CHplDooxAhLR60OKZeNaGhZUrdlO3GYHDOYRxt9YLvdLqnMTE34FNkAQuqdrjzDTB+QiANhZEcLhyk1LbaesNFsGCV1WnsWkrVWgFOaCPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735814003; 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=Dl3U9Yt0XI+YOl5MHB1YMcL1hPnVpiuJJaDNZF1OK90=; b=lWDZ9sXQoeoHc/QvmEXWibQfRaHD726heX/KnZkHWW8RiKRH+fd3mThqsm8563fslTBc768xwBhOwgY4IJlWspm7v/roPrAcpknJvcfapywlQwRowjFSi38VJakGeecsv2knXZzfgZQCgwhHb5TrS51YdAKImMNoqtDauRtdyWs= 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 1735814003812748.7252321918298; Thu, 2 Jan 2025 02:33:23 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTIV2-0003wD-4r; Thu, 02 Jan 2025 05:32:20 -0500 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 1tTIV0-0003vV-7X for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:18 -0500 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 1tTIUy-0005sE-59 for qemu-devel@nongnu.org; Thu, 02 Jan 2025 05:32:17 -0500 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-9-8PbzK5mSP0Wuz3XPM8hV0g-1; Thu, 02 Jan 2025 05:32:14 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 4C210195608B; Thu, 2 Jan 2025 10:32:13 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.39]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3357C1956052; Thu, 2 Jan 2025 10:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1735813935; 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=Dl3U9Yt0XI+YOl5MHB1YMcL1hPnVpiuJJaDNZF1OK90=; b=GyL6V5N4cFWmnZCgfLN4OZ4tNTmu43glD+cI7IWJfGkgkP/4reiJeP9a6sTBC9A6M84ghm RmShUK9G/DkbXgiozMEOdmloxXfin7VSlUc1vbIKajwE6gAACyvCLCxsYaJaaVVrjY4+Pv jL17LkRLPG/yhEsiux6Htu4ACZ7jyUk= X-MC-Unique: 8PbzK5mSP0Wuz3XPM8hV0g-1 X-Mimecast-MFC-AGG-ID: 8PbzK5mSP0Wuz3XPM8hV0g From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/10] tests/functional/test_arm_quanta_gsj: Fix broken test Date: Thu, 2 Jan 2025 11:31:38 +0100 Message-ID: <20250102103138.354618-11-thuth@redhat.com> In-Reply-To: <20250102103138.354618-1-thuth@redhat.com> References: <20250102103138.354618-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.17 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: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.186, 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_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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: 1735814005255019100 ASSET_IMAGE needs to be prefixed with "self." ... this bug apparently went in unnoticed because the test is not run by default. Message-ID: <20250102073403.36328-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- tests/functional/test_arm_quanta_gsj.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/test_arm_quanta_gsj.py b/tests/functional/tes= t_arm_quanta_gsj.py index 7aa5209bea..7b82e2185c 100755 --- a/tests/functional/test_arm_quanta_gsj.py +++ b/tests/functional/test_arm_quanta_gsj.py @@ -35,7 +35,7 @@ class EmcraftSf2Machine(LinuxKernelTest): @skipUnless(os.getenv('QEMU_TEST_TIMEOUT_EXPECTED'), 'Test might timeo= ut') def test_arm_quanta_gsj(self): self.set_machine('quanta-gsj') - image_path =3D self.uncompress(ASSET_IMAGE, 'obmc.mtd', format=3D'= gz') + image_path =3D self.uncompress(self.ASSET_IMAGE, format=3D'gz') =20 self.vm.set_console() drive_args =3D 'file=3D' + image_path + ',if=3Dmtd,bus=3D0,unit=3D= 0' --=20 2.47.1