From patchwork Thu Nov 16 18:05:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 744445 Delivered-To: patch@linaro.org Received: by 2002:a5d:5388:0:b0:32d:baff:b0ca with SMTP id d8csp471015wrv; Thu, 16 Nov 2023 10:07:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IGkjbKAGcPa8HR89N9OBhw1nDa9tds9CdN5ZdztytnERFyTkTchmVhWvUm+8+hboI5DFZdL X-Received: by 2002:a5d:584e:0:b0:32d:a4e5:d3d1 with SMTP id i14-20020a5d584e000000b0032da4e5d3d1mr13815856wrf.4.1700158020253; Thu, 16 Nov 2023 10:07:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700158020; cv=none; d=google.com; s=arc-20160816; b=g//zsynNXfJe35PpwfoqV3acWcExInFWQbuOk8tGXwYYsML0csYNzipN7WeAO2IYp4 Z0QyvnVobAWbuKyu+EUGi+9xA4Y8Fl4Icy2m3+ju2e5pjxJmq44CgmssTU6ELCDd2tIu IFrjkhA0nKOS8wIhbKDuW5ZGnS+fUdXiUfmkfWWvL5nHTyZQxFqT2vu2iZR4w4ItotAF 74RAICcq9qQOxEXYv8V1zCDJQrO97MC6zlwEr0IgjAvUblXo+CwpDErIVBgCTrHbjQcu Aal5azioolOL472+7gBl0b2WxGZqIvTx1u6IPXJ21RWqV1UL2k5s6E1rqWLBEMuno0CT njqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ra4XEUokCcONqX8wh+QJ8w5EDL5357lCKuH5c1e79Mw=; fh=iCN9tuTwM5rayWWWJtHoGNfuTLfrQgz//t8J35Hw7Ts=; b=MJAXeN8h6X55jDppZWRy3IgV02MBwyAhGynCmUdXRHSuaWva7rYrWluE3LSTZT8hGv BKSd5FKOKR6jKGW8AvEmSZsrKoMhugaKDCfEPM6R9mAlIQQnbLK3Ilwn8//ws9sXCco2 OPIpPedB7k+9v5S9G9sjjNhmzqr5yzBw5xfpy9jCe/3LMWNSPwjvO0u6vDdh0uQhetLd USxtyGZS1WZrJij83FjtRDZTl9Y9mtrrlWSjPNUiqNbAC+/K3V2I3/wmVpo+DgjZRVoh ShsdkP2FSFU6y/ixCA0p14gFHl+NWQc1CFRosxZnDBh2yR9t4Z7Sis6JcZHirN0dujz5 AV8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PGUcVUll; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k18-20020a5d6292000000b003231da92d1esi19416wru.693.2023.11.16.10.07.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Nov 2023 10:07:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PGUcVUll; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 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 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= 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 X-MC-Unique: kXddjnycMOCAiL5UdEHRxA-1 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) From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: =?utf-8?q?Philippe_Mathieu-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 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé assertRegexpMatches() has been removed in Python 3.12 and should be replaced by assertRegex(). See: https://docs.python.org/3.12/whatsnew/3.12.html#id3 Inspired-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé 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 = self.vm.cmd('human-monitor-command', command_line='info version') - self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') + self.assertRegex(res, r'^(\d+\.\d+\.\d)') To execute your test, run: 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 = self.vm.cmd('human-monitor-command', command_line='info version') - self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') + self.assertRegex(res, r'^(\d+\.\d+\.\d)')