From nobody Wed Nov 27 04:42:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700115651; cv=none; d=zohomail.com; s=zohoarc; b=Ye0C2wxymBmY0eJ2rOwrCWbOk5aLolHJ9PC9ads0GOOMiUZXAOx7y2uZdvbdEb9+WShPvqV/F/DD5ZcYjSSbnfi/EF43ZEyxqvJOFkN14IRqhe3s7fhS4RZVeZLi2kUrOEKl0VIKXTzKWuyjFVagPkYrVtyfiblakVJ2AdZWcy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700115651; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UyczLx7Nt+KEhdC5+z/cpjvPq2cY3WgIOOj9SsTFP3c=; b=IlQ09Vo+5UrrjTTMSf19NFKIf4Ww6cQgjMuTiKts0+4rqtnAfDKl7UCN9FjsK5Mum9yM+w6lGX+Hz+r0fk2vyyZMN2q+vGDs89AFWTKv/4Dgeu/6vc9kWTr6kgR1ltDQZCm032RkvWG3GAWDIzOrIJt6y5Gx5khMA0i5Wd+rG4c= 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 1700115651165193.33220253669185; Wed, 15 Nov 2023 22:20:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3VjU-0001YQ-Hu; Thu, 16 Nov 2023 01:20:08 -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 1r3VjS-0001Y4-3S for qemu-devel@nongnu.org; Thu, 16 Nov 2023 01:20:06 -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 1r3VjQ-0005uw-4y for qemu-devel@nongnu.org; Thu, 16 Nov 2023 01:20:05 -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-387-MRP4IrAuNNun2slKyZjglQ-1; Thu, 16 Nov 2023 01:19:59 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 4F3601C0434E; Thu, 16 Nov 2023 06:19:59 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.72]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4072A492BE0; Thu, 16 Nov 2023 06:19:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700115603; 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; bh=UyczLx7Nt+KEhdC5+z/cpjvPq2cY3WgIOOj9SsTFP3c=; b=KrMKH2jZlJhJdc31ZHRDlbcIUNiJkCTlBhd25xBgtlzz5VYPkXjSa9XvglxcAZqBvRnyPV 0vZKV2IwxtZHwMhaCIVv5UIwg+Puhz7ylJjIETXWQQOcCDg9nBjdMOlIu21JsJ9rU0gcRl CU661IRuDMYToq/qq0+tNTVJCQRfJ0Q= X-MC-Unique: MRP4IrAuNNun2slKyZjglQ-1 From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Ani Sinha Subject: [PATCH] tests/avocado/mem-addr-space-check: Replace assertEquals() for Python 3.12 Date: Thu, 16 Nov 2023 07:19:56 +0100 Message-ID: <20231116061956.14676-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 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.099, 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: 1700115651765100001 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Thomas Huth Acked-by: Ani Sinha > Acked-by: Ani Sinha Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Note: The test has just been merged, that's why I missed this file in my earlier patch that replaces the assertEquals() 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