From nobody Wed Nov 27 04:48:39 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=1700157985; cv=none; d=zohomail.com; s=zohoarc; b=foZ83FzPBj6p9KM5xgNClVBUJ95iGSUQBRNhhanhxNy4rtJL4HkECPjSCZgkC1jAkx3Un4X2eAWqHSREePjf5yCJjCYUz/JznsFXX1cNQRcGlKhjJAbnQyQE1LhMRsw7W1KuVBgi+sW0OXbjCCLspPw9w27P1jetfl8FsJLvcU0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700157985; 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=+q0puVjuQK+0+JCHt7Qdbx28ezP65GhnXeH0zP+Al8s=; b=aAAL6R585JhIUZ6GKNjm5pc71TprZYVTkr0wqEP0Eg35PgcJ7naJEwQvxOpzuKgZbbG6h6QeQ25QiRqyPVK6omyriqOgvITao3mBroeV0k79jDfBXSVk4atcC7jWWF/z2DuE9GemdytYDluCcmS5SzoujZKEgsK5AVaIbeB/RsQ= 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 1700157985082513.299000386038; Thu, 16 Nov 2023 10:06:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkR-0002Pr-Ce; Thu, 16 Nov 2023 13:05:51 -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 1r3gkK-0002MY-FQ for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:45 -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 1r3gkI-00041J-Bn for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:44 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-58-DRQJ_dvyO5KA61xA58962A-1; Thu, 16 Nov 2023 13:05:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C2CE4811E82; Thu, 16 Nov 2023 18:05:37 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8E691121306; Thu, 16 Nov 2023 18:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157941; 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=+q0puVjuQK+0+JCHt7Qdbx28ezP65GhnXeH0zP+Al8s=; b=QTDK8nrFtsn2lEu4ry79InlyWlsssv2AUHie0gs+UO1YBM7Q2uuLaPCjs7Suz3l2EyZudk tl3wE8FW2wD6GM++JUb7dQen6yv1xEwXvJLyuA6/bfjt/zPwPRKR9FnEekIDhiW8XltT/J CYSpOIeXoXx+o3N50f8eiOvsKGvwy20= X-MC-Unique: DRQJ_dvyO5KA61xA58962A-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 01/10] tests/avocado: Replace assertEquals() for Python 3.12 compatibility Date: Thu, 16 Nov 2023 19:05:25 +0100 Message-ID: <20231116180534.566469-2-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-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.4.1 on 10.11.54.3 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: -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.117, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700157986008100003 assertEquals() has been removed in Python 3.12 and should be replaced by assertEqual(). See: https://docs.python.org/3.12/whatsnew/3.12.html#id3 Message-ID: <20231114134326.287242-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- docs/devel/testing.rst | 2 +- tests/avocado/cpu_queries.py | 2 +- tests/avocado/empty_cpu_model.py | 2 +- tests/avocado/pc_cpu_hotplug_props.py | 2 +- tests/avocado/x86_cpu_model_versions.py | 97 +++++++++++++------------ 5 files changed, 53 insertions(+), 52 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index fef64accc1..87ed30af22 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1077,7 +1077,7 @@ and hypothetical example follows: 'human-monitor-command', command_line=3D'info version') =20 - self.assertEquals(first_res, second_res, third_res) + self.assertEqual(first_res, second_res, third_res) =20 At test "tear down", ``avocado_qemu.Test`` handles all the QEMUMachines shutdown. diff --git a/tests/avocado/cpu_queries.py b/tests/avocado/cpu_queries.py index 86c2d5c92d..d3faa14720 100644 --- a/tests/avocado/cpu_queries.py +++ b/tests/avocado/cpu_queries.py @@ -32,4 +32,4 @@ def test(self): model =3D {'name': c['name']} e =3D self.vm.cmd('query-cpu-model-expansion', model=3Dmodel, type=3D'full') - self.assertEquals(e['model']['name'], c['name']) + self.assertEqual(e['model']['name'], c['name']) diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_mod= el.py index 22f504418d..d906ef3d3c 100644 --- a/tests/avocado/empty_cpu_model.py +++ b/tests/avocado/empty_cpu_model.py @@ -15,5 +15,5 @@ def test(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'-cpu option cannot be empty') diff --git a/tests/avocado/pc_cpu_hotplug_props.py b/tests/avocado/pc_cpu_h= otplug_props.py index b56f51d02a..4bd3e02665 100644 --- a/tests/avocado/pc_cpu_hotplug_props.py +++ b/tests/avocado/pc_cpu_hotplug_props.py @@ -32,4 +32,4 @@ def test_no_die_id(self): self.vm.add_args('-smp', '1,sockets=3D2,cores=3D2,threads=3D2,maxc= pus=3D8') self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=3D1,core-= id=3D0,thread-id=3D0') self.vm.launch() - self.assertEquals(len(self.vm.cmd('query-cpus-fast')), 2) + self.assertEqual(len(self.vm.cmd('query-cpus-fast')), 2) diff --git a/tests/avocado/x86_cpu_model_versions.py b/tests/avocado/x86_cp= u_model_versions.py index 9e07b8a55d..11101e02b9 100644 --- a/tests/avocado/x86_cpu_model_versions.py +++ b/tests/avocado/x86_cpu_model_versions.py @@ -121,94 +121,95 @@ def test_4_1_alias(self): =20 self.assertFalse(cpus['Cascadelake-Server']['static'], 'unversioned Cascadelake-Server CPU model must no= t be static') - self.assertEquals(cpus['Cascadelake-Server'].get('alias-of'), 'Cas= cadelake-Server-v1', - 'Cascadelake-Server must be an alias of Cascadel= ake-Server-v1') + self.assertEqual(cpus['Cascadelake-Server'].get('alias-of'), + 'Cascadelake-Server-v1', + 'Cascadelake-Server must be an alias of Cascadela= ke-Server-v1') self.assertNotIn('alias-of', cpus['Cascadelake-Server-v1'], 'Cascadelake-Server-v1 must not be an alias') =20 self.assertFalse(cpus['qemu64']['static'], 'unversioned qemu64 CPU model must not be static') - self.assertEquals(cpus['qemu64'].get('alias-of'), 'qemu64-v1', - 'qemu64 must be an alias of qemu64-v1') + self.assertEqual(cpus['qemu64'].get('alias-of'), 'qemu64-v1', + 'qemu64 must be an alias of qemu64-v1') self.assertNotIn('alias-of', cpus['qemu64-v1'], 'qemu64-v1 must not be an alias') =20 self.validate_variant_aliases(cpus) =20 # On pc-*-4.1, -noTSX and -IBRS models should be aliases: - self.assertEquals(cpus["Haswell"].get('alias-of'), - "Haswell-v1", + self.assertEqual(cpus["Haswell"].get('alias-of'), + "Haswell-v1", "Haswell must be an alias") - self.assertEquals(cpus["Haswell-noTSX"].get('alias-of'), - "Haswell-v2", + self.assertEqual(cpus["Haswell-noTSX"].get('alias-of'), + "Haswell-v2", "Haswell-noTSX must be an alias") - self.assertEquals(cpus["Haswell-IBRS"].get('alias-of'), - "Haswell-v3", + self.assertEqual(cpus["Haswell-IBRS"].get('alias-of'), + "Haswell-v3", "Haswell-IBRS must be an alias") - self.assertEquals(cpus["Haswell-noTSX-IBRS"].get('alias-of'), - "Haswell-v4", + self.assertEqual(cpus["Haswell-noTSX-IBRS"].get('alias-of'), + "Haswell-v4", "Haswell-noTSX-IBRS must be an alias") =20 - self.assertEquals(cpus["Broadwell"].get('alias-of'), - "Broadwell-v1", + self.assertEqual(cpus["Broadwell"].get('alias-of'), + "Broadwell-v1", "Broadwell must be an alias") - self.assertEquals(cpus["Broadwell-noTSX"].get('alias-of'), - "Broadwell-v2", + self.assertEqual(cpus["Broadwell-noTSX"].get('alias-of'), + "Broadwell-v2", "Broadwell-noTSX must be an alias") - self.assertEquals(cpus["Broadwell-IBRS"].get('alias-of'), - "Broadwell-v3", + self.assertEqual(cpus["Broadwell-IBRS"].get('alias-of'), + "Broadwell-v3", "Broadwell-IBRS must be an alias") - self.assertEquals(cpus["Broadwell-noTSX-IBRS"].get('alias-of'), - "Broadwell-v4", + self.assertEqual(cpus["Broadwell-noTSX-IBRS"].get('alias-of'), + "Broadwell-v4", "Broadwell-noTSX-IBRS must be an alias") =20 - self.assertEquals(cpus["Nehalem"].get('alias-of'), - "Nehalem-v1", + self.assertEqual(cpus["Nehalem"].get('alias-of'), + "Nehalem-v1", "Nehalem must be an alias") - self.assertEquals(cpus["Nehalem-IBRS"].get('alias-of'), - "Nehalem-v2", + self.assertEqual(cpus["Nehalem-IBRS"].get('alias-of'), + "Nehalem-v2", "Nehalem-IBRS must be an alias") =20 - self.assertEquals(cpus["Westmere"].get('alias-of'), - "Westmere-v1", + self.assertEqual(cpus["Westmere"].get('alias-of'), + "Westmere-v1", "Westmere must be an alias") - self.assertEquals(cpus["Westmere-IBRS"].get('alias-of'), - "Westmere-v2", + self.assertEqual(cpus["Westmere-IBRS"].get('alias-of'), + "Westmere-v2", "Westmere-IBRS must be an alias") =20 - self.assertEquals(cpus["SandyBridge"].get('alias-of'), - "SandyBridge-v1", + self.assertEqual(cpus["SandyBridge"].get('alias-of'), + "SandyBridge-v1", "SandyBridge must be an alias") - self.assertEquals(cpus["SandyBridge-IBRS"].get('alias-of'), - "SandyBridge-v2", + self.assertEqual(cpus["SandyBridge-IBRS"].get('alias-of'), + "SandyBridge-v2", "SandyBridge-IBRS must be an alias") =20 - self.assertEquals(cpus["IvyBridge"].get('alias-of'), - "IvyBridge-v1", + self.assertEqual(cpus["IvyBridge"].get('alias-of'), + "IvyBridge-v1", "IvyBridge must be an alias") - self.assertEquals(cpus["IvyBridge-IBRS"].get('alias-of'), - "IvyBridge-v2", + self.assertEqual(cpus["IvyBridge-IBRS"].get('alias-of'), + "IvyBridge-v2", "IvyBridge-IBRS must be an alias") =20 - self.assertEquals(cpus["Skylake-Client"].get('alias-of'), - "Skylake-Client-v1", + self.assertEqual(cpus["Skylake-Client"].get('alias-of'), + "Skylake-Client-v1", "Skylake-Client must be an alias") - self.assertEquals(cpus["Skylake-Client-IBRS"].get('alias-of'), - "Skylake-Client-v2", + self.assertEqual(cpus["Skylake-Client-IBRS"].get('alias-of'), + "Skylake-Client-v2", "Skylake-Client-IBRS must be an alias") =20 - self.assertEquals(cpus["Skylake-Server"].get('alias-of'), - "Skylake-Server-v1", + self.assertEqual(cpus["Skylake-Server"].get('alias-of'), + "Skylake-Server-v1", "Skylake-Server must be an alias") - self.assertEquals(cpus["Skylake-Server-IBRS"].get('alias-of'), - "Skylake-Server-v2", + self.assertEqual(cpus["Skylake-Server-IBRS"].get('alias-of'), + "Skylake-Server-v2", "Skylake-Server-IBRS must be an alias") =20 - self.assertEquals(cpus["EPYC"].get('alias-of'), - "EPYC-v1", + self.assertEqual(cpus["EPYC"].get('alias-of'), + "EPYC-v1", "EPYC must be an alias") - self.assertEquals(cpus["EPYC-IBPB"].get('alias-of'), - "EPYC-v2", + self.assertEqual(cpus["EPYC-IBPB"].get('alias-of'), + "EPYC-v2", "EPYC-IBPB must be an alias") =20 self.validate_aliases(cpus) --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700158019; cv=none; d=zohomail.com; s=zohoarc; b=NI/8dnZVpBZu4lPqwsI13QiO8d7IKC9jO6wCyqjMD82NMtcMQsxWhprLi7Fw2vKKNgirONIIf3v432xoSjFN22ufpjMZb5KCtB3zCFTeKuHTD4gJ1cu8GQjyXVGM0W5/Ku4pv1K3hQ3DM+zEAx6+3C91VOlT0bvgRJWhtJQX/gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700158019; 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=Ra4XEUokCcONqX8wh+QJ8w5EDL5357lCKuH5c1e79Mw=; b=OP+likXYe85i6SuWoRhc1wtUZnW4RYAAcn53lwVbw6O0dvDtw2/uoPkYm3w1/sIgjeoctr/CakdiZWnHywBzTAOuY7LbflU04mNgIo7E6vZbkDIM+6TcSZDq3pLgUApmIgjHroWvLymtpoNGArcBH8gbLz8g8yDFWY9PmvUu3Ww= 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 1700158019930837.8916337875967; Thu, 16 Nov 2023 10:06:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkR-0002Qt-Ii; Thu, 16 Nov 2023 13:05:51 -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 1r3gkL-0002N7-VO for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:47 -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 1r3gkJ-00041p-TD for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:45 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-691-kXddjnycMOCAiL5UdEHRxA-1; Thu, 16 Nov 2023 13:05:39 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5A6CE101A529; Thu, 16 Nov 2023 18:05:39 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 478171121306; Thu, 16 Nov 2023 18:05:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157943; 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=Ra4XEUokCcONqX8wh+QJ8w5EDL5357lCKuH5c1e79Mw=; b=PGUcVUll8Lfddu4XFcnaqI2qyc3PTm4o6xheT6zM8HhZlZyQl2Uecqp9sFg847OpZc8JUq Y4XGSsvmOF7AEgpcTkpzHQ83FVUmf2Jdbtid8RyYbFLh3F2xbZzkuviirFhdgBI6pfqMqM tkGWtYpxKequyM1h/0JIjLSQhvvmR3Q= X-MC-Unique: kXddjnycMOCAiL5UdEHRxA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 02/10] tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility Date: Thu, 16 Nov 2023 19:05:26 +0100 Message-ID: <20231116180534.566469-3-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-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.4.1 on 10.11.54.3 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.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700158022086100009 From: Philippe Mathieu-Daud=C3=A9 assertRegexpMatches() has been removed in Python 3.12 and should be replace= d by assertRegex(). See: https://docs.python.org/3.12/whatsnew/3.12.html#id3 Inspired-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20231114144832.71612-1-philmd@linaro.org> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- docs/devel/testing.rst | 2 +- tests/avocado/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 87ed30af22..22218dbedb 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -1016,7 +1016,7 @@ class. Here's a simple usage example: self.vm.launch() res =3D self.vm.cmd('human-monitor-command', command_line=3D'info version') - self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') + self.assertRegex(res, r'^(\d+\.\d+\.\d)') =20 To execute your test, run: =20 diff --git a/tests/avocado/version.py b/tests/avocado/version.py index 93ffdf3d97..c6139568a1 100644 --- a/tests/avocado/version.py +++ b/tests/avocado/version.py @@ -22,4 +22,4 @@ def test_qmp_human_info_version(self): self.vm.launch() res =3D self.vm.cmd('human-monitor-command', command_line=3D'info version') - self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') + self.assertRegex(res, r'^(\d+\.\d+\.\d)') --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700158002; cv=none; d=zohomail.com; s=zohoarc; b=MWufAu1HeKkv1JgaJqM5Tz7T9bIFnYshDgU8FAF8IwS7c+/LdXJNKsMukAIkrYoEsuj368euSL7c5ywfTM8LoIwJkY6ROcSfa/nOLmfPP4Lu0xBhCriVWW5qIe+/MLNUA9qKEOAQU5vTvYW6uxq2ZkRotp8w2+MfEdnWtKYz9oY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700158002; 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=VyE20AWaD3XR0qppfEGr4Tjw942ZKZylMdYoR15iWOQ=; b=kHIkrRUVKeTZQ74jyeHPrA9PJaanvcHiQom8+n2FRCFqBx8fzCvWqqdp7J6SwuXGBHyqby1SBOwQg+0KdeyMtUYaTo8kxIDJECyjZQJw2S6h38rp+SVgPxp/xGxsuDIrgLPrdxn37nu6D4rm8ghoSkqX2bvHn4yLPgMeySnRQL0= 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 1700158002018338.25187824859813; Thu, 16 Nov 2023 10:06:42 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkP-0002Pc-4q; Thu, 16 Nov 2023 13:05:49 -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 1r3gkK-0002Mo-NQ for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:45 -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 1r3gkJ-00041T-6Y for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:44 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-mX9xJeMdMui89D2Rd14RRg-1; Thu, 16 Nov 2023 13:05:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 686F33C11C68; Thu, 16 Nov 2023 18:05:40 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EF051121306; Thu, 16 Nov 2023 18:05:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157942; 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=VyE20AWaD3XR0qppfEGr4Tjw942ZKZylMdYoR15iWOQ=; b=IEI0nW8F/uQ++NZT2gzkojqiXezxqWJAlkFJ3MRtI7NEwMbBkRYXDNsotKdQPQ6AXi83kY DuITRLUDbKY7S9aB5DwoAAQuGH5jwLUiwx+jpfbqB1kHOsa4tFpXfSp5pOOJGhMYzQMSsG 0S9xvJUkd0xTsJ/t+bB+IyJF4DFAnGw= X-MC-Unique: mX9xJeMdMui89D2Rd14RRg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Antonio Caggiano Subject: [PULL 03/10] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support Date: Thu, 16 Nov 2023 19:05:27 +0100 Message-ID: <20231116180534.566469-4-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700158004040100001 Content-Type: text/plain; charset="utf-8" The "edid" feature has been added to vhost-user-gpu in commit c06444261e20 ("contrib/vhost-user-gpu: implement get_edid feature"), so waiting for "features: +virgl -edid" in the test does not work anymore, it's "+edid" instead of "-edid" now! While we're at it, move the expected string to the preceeding exec_command_and_wait_for_pattern() instead (since waiting for empty string here does not make too much sense). Message-ID: <20231114203456.319093-1-thuth@redhat.com> Reviewed-by: Antonio Caggiano Signed-off-by: Thomas Huth --- tests/avocado/virtio-gpu.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/avocado/virtio-gpu.py b/tests/avocado/virtio-gpu.py index 89bfecc715..6091f614a4 100644 --- a/tests/avocado/virtio-gpu.py +++ b/tests/avocado/virtio-gpu.py @@ -149,10 +149,8 @@ def test_vhost_user_vga_virgl(self): # TODO: probably fails because we are missing the VirGL featur= es self.cancel("VirGL not enabled?") self.wait_for_console_pattern("as init process") - exec_command_and_wait_for_pattern( - self, "/usr/sbin/modprobe virtio_gpu", "" - ) - self.wait_for_console_pattern("features: +virgl -edid") + exec_command_and_wait_for_pattern(self, "/usr/sbin/modprobe virtio= _gpu", + "features: +virgl +edid") self.vm.shutdown() qemu_sock.close() vugp.terminate() --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700157995; cv=none; d=zohomail.com; s=zohoarc; b=n/+wug0lHHr9wqUfFXkclA2G4iZ/iok2mptzL6IVLSIshSZiU2Giu6FGSWqaMmcVwgUCe+5v9uPe2MD8mDSfzOPypkzxrWnOimO4OStyLAZSMXV/DxFb4RVmoBEi/SOIQ2/rKozX7ydT4DpfYI6yAzK3XI/10SlfWJ5+c+OXWkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700157995; 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=iRQrsg9JElMsYFARg6ZaoqvlXVxBOPdXlhFTERZzbH0=; b=HOFO+FGkQVPF2xtASPIekBAhmvIGw0XOGfEGgzG6Cqy/GBbMpmQ6hyXhCWo7ZcE4lmTIsmxHF0IPjNPTV1176VPHCVSIp7rIMKn8Zb08bCu+sYag0TQh0Vz5rvRuKmJtdyR0sQRMS8UWta3wYggMErauJwfbuh+/ZUE9mCdBc1A= 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 170015799509977.21826647550563; Thu, 16 Nov 2023 10:06:35 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkW-0002St-71; Thu, 16 Nov 2023 13:05:56 -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 1r3gkM-0002No-3o for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:47 -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 1r3gkK-000422-KR for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:45 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-153-14uBFUXKO72gR4VFo--f1w-1; Thu, 16 Nov 2023 13:05:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 97A451C0BA46 for ; Thu, 16 Nov 2023 18:05:41 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACAD71121306; Thu, 16 Nov 2023 18:05:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157943; 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=iRQrsg9JElMsYFARg6ZaoqvlXVxBOPdXlhFTERZzbH0=; b=deN+1OT0AFFP06tTJ0N2uvS63Y63UC1NcYjyx6hGyu/aVonjy5oPiC0GIgXWi1cVV8Q4VE T5FLs4VzIOxxAiPN/cbuLkj3TLzL1Dl4zUXBCGzaSBoYkKoACbCJga0Am5Z7Ez4GH7/abE 8tlzkFPERl8lmHD5gWjyHcD9CC5ZNbM= X-MC-Unique: 14uBFUXKO72gR4VFo--f1w-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Eric Auger Subject: [PULL 04/10] tests/avocado/intel_iommu: Add asset hashes to avoid warnings Date: Thu, 16 Nov 2023 19:05:28 +0100 Message-ID: <20231116180534.566469-5-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700157995965100001 Content-Type: text/plain; charset="utf-8" The intel_iommu test is currently succeeding with annoying warnings. Add the proper asset hashes to avoid those. Message-ID: <20231114143531.291820-1-thuth@redhat.com> Reviewed-by: Eric Auger Signed-off-by: Thomas Huth --- tests/avocado/intel_iommu.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/avocado/intel_iommu.py b/tests/avocado/intel_iommu.py index 474d62f6bf..77635ab56c 100644 --- a/tests/avocado/intel_iommu.py +++ b/tests/avocado/intel_iommu.py @@ -54,9 +54,11 @@ def common_vm_setup(self, custom_kernel=3DNone): return =20 kernel_url =3D self.distro.pxeboot_url + 'vmlinuz' + kernel_hash =3D '5b6f6876e1b5bda314f93893271da0d5777b1f3c' initrd_url =3D self.distro.pxeboot_url + 'initrd.img' - self.kernel_path =3D self.fetch_asset(kernel_url) - self.initrd_path =3D self.fetch_asset(initrd_url) + initrd_hash =3D 'dd0340a1b39bd28f88532babd4581c67649ec5b1' + self.kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dker= nel_hash) + self.initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dini= trd_hash) =20 def run_and_check(self): if self.kernel_path: --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700157978; cv=none; d=zohomail.com; s=zohoarc; b=BpoMs/s9UXJs95ZTNjeg0LLSEn/yW2/E6uSZsObJ+OKwrqHFWXAYLBkvLyzAKuv0XX8LLsJ1/TARaTvkfKoLNNUQu01pzffyUpyq336/iT9qpB28o2UK1377miWB6EdIU6pT6rc5h87ycOCQmAIxZ3pwd5SvShpcZwrlsNMpJ2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700157978; h=Content-Transfer-Encoding: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:Cc; bh=PkLOx5YuLoi1SO1djyzQQvQR+C5F8GgJGgGKA1Lui/0=; b=NoXsyaFtvKRJrVlTR75Flkz3CLLU3Pp3FVJQhI4deMgaMX7MbUN0qbKCAr4F/IyEfKe8cJoDvAxSIHCuiUM1Ewx/81JUhvYwT1ACsmWg9jZsUuqWCDyJoW3v/NWdyWxy+RnA6kJhtZZeFHALXKm2fVTHFz40lK9gxLFxvLtnYo8= 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 1700157978795943.5858766804514; Thu, 16 Nov 2023 10:06:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkS-0002RK-Ax; Thu, 16 Nov 2023 13:05:52 -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 1r3gkN-0002On-SL for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:48 -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 1r3gkL-00042N-AY for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:47 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-267-e7t5s_XoOR6JHPIEJx-DbQ-1; Thu, 16 Nov 2023 13:05:43 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id CFF67101A54C for ; Thu, 16 Nov 2023 18:05:42 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8BCD1121306; Thu, 16 Nov 2023 18:05:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkLOx5YuLoi1SO1djyzQQvQR+C5F8GgJGgGKA1Lui/0=; b=ZVAhbOrhOiaW7T6zWt1d0fZnbNZIdh8JWc6bcG50LSCU7dFB5d1/kJpUE0Xtn25q2HLtS/ 9ZhtssH3W7awBVUGIfrlwXhow+nLLI/yDdL6RDD22rFNfkI4yo5vqSS59DFON2j/rcXoKR dLYOLUVTaQbVUnSbpx4Yjomuvys2FDY= X-MC-Unique: e7t5s_XoOR6JHPIEJx-DbQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PULL 05/10] tests/avocado/multiprocess: Add asset hashes to silence warnings Date: Thu, 16 Nov 2023 19:05:29 +0100 Message-ID: <20231116180534.566469-6-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700157980087100003 Content-Type: text/plain; charset="utf-8" The multiprocess test is currently succeeding with an annoying warning: (1/2) tests/avocado/multiprocess.py:Multiprocess.test_multiprocess_x86_64: WARN: Test passed but there were warnings during execution. Check the log for details In the log, you can find an entry like: WARNI| No hash provided. Cannot check the asset file integrity. Add the proper asset hashes to avoid those warnings. Message-ID: <20231115145852.494052-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- tests/avocado/multiprocess.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/avocado/multiprocess.py b/tests/avocado/multiprocess.py index 9112a4cacc..ee7490ae08 100644 --- a/tests/avocado/multiprocess.py +++ b/tests/avocado/multiprocess.py @@ -18,8 +18,8 @@ class Multiprocess(QemuSystemTest): """ KERNEL_COMMON_COMMAND_LINE =3D 'printk.time=3D0 ' =20 - def do_test(self, kernel_url, initrd_url, kernel_command_line, - machine_type): + def do_test(self, kernel_url, kernel_hash, initrd_url, initrd_hash, + kernel_command_line, machine_type): """Main test method""" self.require_accelerator('kvm') self.require_multiprocess() @@ -30,8 +30,8 @@ def do_test(self, kernel_url, initrd_url, kernel_command_= line, os.set_inheritable(proxy_sock.fileno(), True) os.set_inheritable(remote_sock.fileno(), True) =20 - kernel_path =3D self.fetch_asset(kernel_url) - initrd_path =3D self.fetch_asset(initrd_url) + kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) + initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dinitrd_h= ash) =20 # Create remote process remote_vm =3D self.get_vm() @@ -72,13 +72,16 @@ def test_multiprocess_x86_64(self): kernel_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/31/Everything/x86_64/os/images' '/pxeboot/vmlinuz') + kernel_hash =3D '5b6f6876e1b5bda314f93893271da0d5777b1f3c' initrd_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/31/Everything/x86_64/os/images' '/pxeboot/initrd.img') + initrd_hash =3D 'dd0340a1b39bd28f88532babd4581c67649ec5b1' kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'console=3DttyS0 rdinit=3D/bin/bash') machine_type =3D 'pc' - self.do_test(kernel_url, initrd_url, kernel_command_line, machine_= type) + self.do_test(kernel_url, kernel_hash, initrd_url, initrd_hash, + kernel_command_line, machine_type) =20 def test_multiprocess_aarch64(self): """ @@ -87,10 +90,13 @@ def test_multiprocess_aarch64(self): kernel_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/31/Everything/aarch64/os/images' '/pxeboot/vmlinuz') + kernel_hash =3D '3505f2751e2833c681de78cee8dda1e49cabd2e8' initrd_url =3D ('https://archives.fedoraproject.org/pub/archive/fe= dora' '/linux/releases/31/Everything/aarch64/os/images' '/pxeboot/initrd.img') + initrd_hash =3D '519a1962daf17d67fc3a9c89d45affcb399607db' kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + 'rdinit=3D/bin/bash console=3DttyAMA0') machine_type =3D 'virt,gic-version=3D3' - self.do_test(kernel_url, initrd_url, kernel_command_line, machine_= type) + self.do_test(kernel_url, kernel_hash, initrd_url, initrd_hash, + kernel_command_line, machine_type) --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700158032; cv=none; d=zohomail.com; s=zohoarc; b=KuF85sA91kbOk8gDzMAhL/6lUqAp6qkwBc7ThSE/F+FIu4Ly8dEIv9l98pkkH7bqN0VzYdukTMNshZvD2i4SJGSidgKjefGq3aWOjdxABWNEvt29l589UdaXfiEoUMHZOpOx8ULbVaZi+NSV4ANFKGZgYeySJIsn0A6kk9sbz90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700158032; 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=tB/pCRwE6I2L5D3js1xRYebjMLJzToa+gCRj9h7W9PI=; b=dFaC2oiUr+ykeMo96ymRQbfHMbWK+FNQf2RlER71G8F2Gb2RNruHjqosqZCSPqWJyXaXNGopY6VlAiofHo0ZBTt1mQk9x7gz6lXacVqr/qCFEeFMo4OF2U2jBoTm5wBqm3D6RsxeMiXOIrgmbTkxq8Hh4p678bbnugzUtnmq4J4= 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 1700158032497839.5426428979083; Thu, 16 Nov 2023 10:07:12 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkS-0002Re-Uf; Thu, 16 Nov 2023 13:05:52 -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 1r3gkR-0002QY-AD for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:51 -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 1r3gkP-00043R-S0 for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:51 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-568-65o8um9JMRqKHtHtGcymlw-1; Thu, 16 Nov 2023 13:05:45 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id AE3ED811E7B; Thu, 16 Nov 2023 18:05:44 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 48D881121306; Thu, 16 Nov 2023 18:05:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157949; 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=tB/pCRwE6I2L5D3js1xRYebjMLJzToa+gCRj9h7W9PI=; b=f5wXf/n32SpC6uPq/Eu5Fq1lA1MsEdGj5Fp3f8HrfUm0lYubXIzunYmMwWfiTmAzHWMSta LEPBjzS8mVdgRiwM/GIKuC91kdIuMARWKLNMd0nhAEl/OecjuHq4vAoKPnd469Wl0emQC7 0tjBEdL55XLqKsMV436sWuj1Bc0iI7g= X-MC-Unique: 65o8um9JMRqKHtHtGcymlw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 06/10] tests/avocado: Make fetch_asset() unconditionally require a crypto hash Date: Thu, 16 Nov 2023 19:05:30 +0100 Message-ID: <20231116180534.566469-7-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-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.4.1 on 10.11.54.3 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: -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.117, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700158034245100003 From: Philippe Mathieu-Daud=C3=A9 In a perfect world we'd have reproducible tests, but then we'd be sure we run the same binaries. If a binary artifact isn't hashed, we have no idea what we are running. Therefore enforce hashing for all our artifacts. With this change, unhashed artifacts produce: $ avocado run tests/avocado/multiprocess.py (1/2) tests/avocado/multiprocess.py:Multiprocess.test_multiprocess_x86_6= 4: ERROR: QemuBaseTest.fetch_asset() missing 1 required positional argument= : 'asset_hash' (0.19 s) Inspired-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Alex Benn=C3=A9e Message-ID: <20231115205149.90765-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- tests/avocado/avocado_qemu/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado= _qemu/__init__.py index d71e989db6..304c428168 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -254,7 +254,7 @@ def setUp(self, bin_prefix): self.cancel("No QEMU binary defined or found in the build tree= ") =20 def fetch_asset(self, name, - asset_hash=3DNone, algorithm=3DNone, + asset_hash, algorithm=3DNone, locations=3DNone, expire=3DNone, find_only=3DFalse, cancel_on_missing=3DTrue): return super().fetch_asset(name, --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700158074; cv=none; d=zohomail.com; s=zohoarc; b=ZsCVgfR+iPCk5U/jbnhJRc9NPq3GrYg6rtsJ6CA/X8BSVHuHy4zkya5B+/YHhLyD9brNlVV91SheOG2alEy53u4LJWkxEHxlltaF3gvDKZv0D/nhF/dxSgSKkJ51VFACtGLcmu3eVjYEuyxsuYs3XKnhhbJHyyMAWlliv4kKLIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700158074; 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=rI1J6Rno0NGD8Owcv853KMrH+Ed5aRsoWuNE2En7FZc=; b=ncgA3LBMEwCuaMqmSxFDbLnYS6eCBxTZXJeIT1iI04Z2hP+gKquma7c42Ko0Jn8ZfCbZItaEMxkm6a1E9EeZ0fWhYXSzH9VsgMF9fHvQRMpDQ0ApaftgviC+yw3qGztsvNP58ZYGaNko4ppJfDeHR51dvc9e2cnTEW64z+dmvLs= 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 1700158074025443.1756004044672; Thu, 16 Nov 2023 10:07:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkT-0002SV-Nw; Thu, 16 Nov 2023 13:05:53 -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 1r3gkQ-0002QX-PA for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:51 -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 1r3gkP-00043H-9e for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:50 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-CHtQ0ziZPrGFR511S6CO4A-1; Thu, 16 Nov 2023 13:05:46 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3CF9E857BC2; Thu, 16 Nov 2023 18:05:46 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 316DB1121306; Thu, 16 Nov 2023 18:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157948; 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=rI1J6Rno0NGD8Owcv853KMrH+Ed5aRsoWuNE2En7FZc=; b=hNpozQ5XDHmDv3kedlCm8uZEhxZziBtY/ny/6Y6Xy8wrqPKtrPgLZEQl4DSSsIZnhjROBS +RBVZfa7gYOwVT58ohBmzujDlR2isitYJzrHctba6yOZRTuD8h7kwy6N0sntklKC/JzEOy Mrm33JyodYQ+nDzKBndYKbEJ+x2QKCk= X-MC-Unique: CHtQ0ziZPrGFR511S6CO4A-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Peter Maydell Subject: [PULL 07/10] tests/avocado/replay_kernel: Mark the test_x86_64_pc as flaky Date: Thu, 16 Nov 2023 19:05:31 +0100 Message-ID: <20231116180534.566469-8-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700158074289100001 Content-Type: text/plain; charset="utf-8" It's failing very often, so don't run this by default anymore until it gets fixed. Message-ID: <20231114153019.295131-1-thuth@redhat.com> Reviewed-by: Peter Maydell Signed-off-by: Thomas Huth --- tests/avocado/replay_kernel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index a18610542e..53cb7e5091 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -81,7 +81,8 @@ def run_rr(self, kernel_path, kernel_command_line, consol= e_pattern, logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1)) =20 class ReplayKernelNormal(ReplayKernelBase): - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') + + @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets s= tuck') def test_x86_64_pc(self): """ :avocado: tags=3Darch:x86_64 --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700157979; cv=none; d=zohomail.com; s=zohoarc; b=WuzmyZ49tZsdpSVIaCLX9v60cFpdCSViCWGMrbjAIPSDzDEmS4W2krK11XmuwUnIjq3jsQ+n/GKLYFIH82xC1aHsZLX3xPfv2nlXeCen0c0sdY5FDWppkoF2S7xrrwFL3MXvtOFcvGj1frqkzx/2q93QsKKUqNaGe/dmBpO51j0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700157979; 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=FRnaGY+Jev9ZahpeHvw73uuMO5QTSDopK7RVrPjV6uY=; b=N0ozao2dinrfQ05R/Hl/dQSwMCt6z/NBsXUOdjRhmMiY/TaUNl3As6+IzjoV6Xn5PfQEvBLIquHEbOxUY430CUZoWR7xyElAiZRDbf0xsI9t9x3NjZDAYD342LIW2Ig019ikl3Yyxi0b6/m02J9FQCBwO7x6JNrLF4aOig1vlKw= 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 1700157979950494.28031886072483; Thu, 16 Nov 2023 10:06:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkW-0002Sx-MQ; Thu, 16 Nov 2023 13:05:56 -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 1r3gkS-0002RU-JA for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:52 -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 1r3gkQ-00043Z-Mg for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:52 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-618-sFFypTdIMF-y_2H-8aO6OQ-1; Thu, 16 Nov 2023 13:05:47 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5389811E7D; Thu, 16 Nov 2023 18:05:47 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CDD51121306; Thu, 16 Nov 2023 18:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157950; 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=FRnaGY+Jev9ZahpeHvw73uuMO5QTSDopK7RVrPjV6uY=; b=f/LyCU+KwpV1CihROFVL5QwHMZnAfsh/4qrAlsOg2L6B12fl7O0Cgg5bccR1OBmLzsNf2u E2R1aI/hrmXVFfFZAh+WGHfvgrVG2mgFAmyarXnx7MWiWbucs+pv9H72DF88TwQ+WReb7I OZxNPcLfpaR0qAF/E/R0w9Am8tzLfNo= X-MC-Unique: sFFypTdIMF-y_2H-8aO6OQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ani Sinha Subject: [PULL 08/10] tests/avocado/mem-addr-space-check: Replace assertEquals() for Python 3.12 Date: Thu, 16 Nov 2023 19:05:32 +0100 Message-ID: <20231116180534.566469-9-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-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.4.1 on 10.11.54.3 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: -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.117, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700157981931100007 assertEquals() has been removed in Python 3.12 and should be replaced by assertEqual(). See: https://docs.python.org/3.12/whatsnew/3.12.html#id3 Message-ID: <20231116061956.14676-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Ani Sinha Signed-off-by: Thomas Huth --- tests/avocado/mem-addr-space-check.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/avocado/mem-addr-space-check.py b/tests/avocado/mem-addr= -space-check.py index be949222a4..363c3f12a6 100644 --- a/tests/avocado/mem-addr-space-check.py +++ b/tests/avocado/mem-addr-space-check.py @@ -49,7 +49,7 @@ def test_phybits_low_pse36(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 def test_phybits_low_pae(self): @@ -69,7 +69,7 @@ def test_phybits_low_pae(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 def test_phybits_ok_pentium_pse36(self): @@ -149,7 +149,7 @@ def test_phybits_low_nonpse36(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 # now lets test some 64-bit CPU cases. @@ -179,7 +179,7 @@ def test_phybits_low_tcg_q35_70_amd(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 def test_phybits_low_tcg_q35_71_amd(self): @@ -202,7 +202,7 @@ def test_phybits_low_tcg_q35_71_amd(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 def test_phybits_ok_tcg_q35_70_amd(self): @@ -288,7 +288,7 @@ def test_phybits_low_tcg_q35_71_amd_41bits(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 def test_phybits_ok_tcg_q35_71_amd_41bits(self): @@ -332,7 +332,7 @@ def test_phybits_low_tcg_q35_intel_cxl(self): self.vm.set_qmp_monitor(enabled=3DFalse) self.vm.launch() self.vm.wait() - self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be= 1") + self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be = 1") self.assertRegex(self.vm.get_log(), r'phys-bits too low') =20 def test_phybits_ok_tcg_q35_intel_cxl(self): --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700158018; cv=none; d=zohomail.com; s=zohoarc; b=mJXfvCQ1xe3beCEDOtDAlSuwCpmm0OD43Qfzo0zZfcEAa2IrdCwHe+Qku8xEJudkbzXTBSOjQr0NtWgDo6Ge84Xa1sAut0hGIXYTEc38I0Z2HnIam75S3ZbLmSwDSOqXsrl/tMMaSvMcNmpTlTp3OCcZ9d5Oug3+afYupwKVNcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700158018; 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=OI6jInKvfEQ2SeOWQTOmL2JfEqfOfTs6vwhO3MUj/QM=; b=mU41TclJ2ksmrL9HrKAp8vyUiVblc2Fa769Hv/U/hoHCtLiRutnJR1p6QMyCmqK9Q+pm+3LhrEH18wR/a3jMtmG6lFYfmFKi3BIkhLnvp3qOrFdVd5oDD3ooZaOSF+BE57KqgUUxIZM7kW2/YUc56MdLAKQXyZC+tm+HHkecrbg= 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 1700158018127507.45154964406447; Thu, 16 Nov 2023 10:06:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkc-0002UF-Cy; Thu, 16 Nov 2023 13:06:02 -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 1r3gkU-0002Sk-48 for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05: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 1r3gkS-00043v-Gg for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:53 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-169-gBKeyG35NTaMJ6B3NDsfyg-1; Thu, 16 Nov 2023 13:05:49 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D7302808FC7; Thu, 16 Nov 2023 18:05:49 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46E131121306; Thu, 16 Nov 2023 18:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157951; 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=OI6jInKvfEQ2SeOWQTOmL2JfEqfOfTs6vwhO3MUj/QM=; b=MlKsCN+plIaXje4mUIYDmCXD1VPPQRcTXasX42UmgIkMcfFbRjKF0apTXIt0SF71V/QKrS BY5Gm3z2laB9I3TxreTCe/8afHZttct4uuB62sIPbXJgd8NYf7p5yLXwwGgR7rfLmYhlsP U7vHsaS2LHHtALwtLPT+BgIwV7DdrXw= X-MC-Unique: gBKeyG35NTaMJ6B3NDsfyg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Nicholas Piggin Subject: [PULL 09/10] tests/avocado: reverse_debugging drain console to prevent hang Date: Thu, 16 Nov 2023 19:05:33 +0100 Message-ID: <20231116180534.566469-10-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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.117, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700158020076100003 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Like replay_linux.py, reverse_debugging.py starts the vm with console set but does not interact with it (e.g., with wait_for_console_pattern). In this situation, the console should have a drainer attached so the socket does not fill. replay_linux.py has a drainer, but it is missing from reverse_debugging.py. Per analysis in Link: this can cause the console socket/pipe to fill and QEMU get stuck in qemu_chr_write_buffer, leading to strange test case failures (ppc64 fails because it prints a lot to console in early bios). Attaching a drainer prevents this. Note, this commit does not fix bugs introduced by the commits referenced in the first two Fixes: tags, but together those commits conspire to irritate the problem and cause test case failure, which this commit fixes. Link: https://lore.kernel.org/qemu-devel/ZVT-bY9YOr69QTPX@redhat.com/ Fixes: 1d4796cd0083 ("python/machine: use socketpair() for console connecti= ons") Fixes: 761a13b23946 ("tests/avocado: ppc64 reverse debugging tests for pser= ies and powernv") Fixes: be52eca30978 ("tests/acceptance: add reverse debugging test") Tested-by: Thomas Huth Signed-off-by: Nicholas Piggin Message-ID: <20231116115354.228678-1-npiggin@gmail.com> Signed-off-by: Thomas Huth --- tests/avocado/reverse_debugging.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/avocado/reverse_debugging.py b/tests/avocado/reverse_deb= ugging.py index fc47874eda..128d85bc0e 100644 --- a/tests/avocado/reverse_debugging.py +++ b/tests/avocado/reverse_debugging.py @@ -12,6 +12,7 @@ =20 from avocado import skipIf from avocado_qemu import BUILD_DIR +from avocado.utils import datadrainer from avocado.utils import gdb from avocado.utils import process from avocado.utils.network.ports import find_free_port @@ -52,6 +53,10 @@ def run_vm(self, record, shift, args, replay_path, image= _path, port): if args: vm.add_args(*args) vm.launch() + console_drainer =3D datadrainer.LineLogger(vm.console_socket.filen= o(), + logger=3Dself.log.getChild('console'), + stop_check=3D(lambda : not vm.is_runni= ng())) + console_drainer.start() return vm =20 @staticmethod --=20 2.41.0 From nobody Wed Nov 27 04:48:39 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=1700158067; cv=none; d=zohomail.com; s=zohoarc; b=WeVY3jEjIfZZy5Sr7uYkcBnmWY45Vnc4krvz+Hrt+jFvNJLWsYUIU3fu2Vo+31OXHXpBpy1F92/WTPd1GZeClABHZgJRkvs12y/5H469FtXUPk56iIPwj+xbitG/3ghYIZexc6Wn7YRxbCdHuuNFZfvx6u/5RV7qDSPaTwNm2TU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700158067; 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=RCWd49Yrg9RU1/fWxOi5fA4KEV6str5bow5FbHC2aA4=; b=R/m7SZUTb9GjKofkn7yVP3F2huOI57ydAUY5gE47S+I8+3qCAOG15HVbRvmoGoeHEMeoCIkw7IHgifZS+7yaxfdpBXuKdER6e4TLFEBaFIIpDc7D9/RM9TI1z8uKS1HoMtGqGF2j6nfhCc/eugiNLwlbO3Tt9DA0dD+mtXcvhBY= 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 1700158067837390.00836819457936; Thu, 16 Nov 2023 10:07:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3gkt-0002V1-QS; Thu, 16 Nov 2023 13:06:19 -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 1r3gke-0002Ug-9H for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:06: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 1r3gkT-00044I-VF for qemu-devel@nongnu.org; Thu, 16 Nov 2023 13:05:55 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-bivSErXhOum7yOxmhVz2BA-1; Thu, 16 Nov 2023 13:05:51 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3FD90857BC2; Thu, 16 Nov 2023 18:05:51 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14CFC1121306; Thu, 16 Nov 2023 18:05:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700157953; 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=RCWd49Yrg9RU1/fWxOi5fA4KEV6str5bow5FbHC2aA4=; b=XUs5ZOef1T1j+qniaMHLy0oW4+wc02F/CEl1COQuSTcLwL5H+GWbCaZCGKYWN+oDUDAIc7 1pX2hILqyBTHJrwe5+XtBfVhDpOG1CS9DfJM0i+Ifn6t/pBTwKU6LI6gUp8uI+gFqYf9fC tIrBYbG6fpF9VzfVumQtnHOKslec/bY= X-MC-Unique: bivSErXhOum7yOxmhVz2BA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Nicholas Piggin Subject: [PULL 10/10] tests/avocado: Enable reverse_debugging.py tests in gitlab CI Date: Thu, 16 Nov 2023 19:05:34 +0100 Message-ID: <20231116180534.566469-11-thuth@redhat.com> In-Reply-To: <20231116180534.566469-1-thuth@redhat.com> References: <20231116180534.566469-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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: -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.117, 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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1700158068269100001 Content-Type: text/plain; charset="utf-8" From: Nicholas Piggin Let's try enable reverse_debugging.py in gitlab CI. Signed-off-by: Nicholas Piggin Message-ID: <20231116115354.228678-3-npiggin@gmail.com> Signed-off-by: Thomas Huth --- tests/avocado/reverse_debugging.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/avocado/reverse_debugging.py b/tests/avocado/reverse_deb= ugging.py index 128d85bc0e..b1410e7a69 100644 --- a/tests/avocado/reverse_debugging.py +++ b/tests/avocado/reverse_debugging.py @@ -205,8 +205,6 @@ def get_pc(self, g): return self.get_reg_le(g, self.REG_PC) \ + self.get_reg_le(g, self.REG_CS) * 0x10 =20 - # unidentified gitlab timeout problem - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_x86_64_pc(self): """ :avocado: tags=3Darch:x86_64 @@ -222,8 +220,6 @@ class ReverseDebugging_AArch64(ReverseDebugging): =20 REG_PC =3D 32 =20 - # unidentified gitlab timeout problem - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_aarch64_virt(self): """ :avocado: tags=3Darch:aarch64 @@ -246,8 +242,6 @@ class ReverseDebugging_ppc64(ReverseDebugging): =20 REG_PC =3D 0x40 =20 - # unidentified gitlab timeout problem - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_ppc64_pseries(self): """ :avocado: tags=3Darch:ppc64 @@ -259,7 +253,6 @@ def test_ppc64_pseries(self): self.endian_is_le =3D False self.reverse_debugging() =20 - @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_ppc64_powernv(self): """ :avocado: tags=3Darch:ppc64 --=20 2.41.0