tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility

[PATCH] tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility

Philippe Mathieu-Daudé posted 1 patch 1 year ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20231114144832.71612-1-philmd@linaro.org

Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Cleber Rosa <crosa@redhat.com>

docs/devel/testing.rst   | 2 +-
tests/avocado/version.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility

Posted by Philippe Mathieu-Daudé 1 year ago

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 <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 fef64accc1..0af8f32fa3 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)')
-- 
2.41.0

Re: [PATCH] tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility

Posted by Thomas Huth 1 year ago

On 14/11/2023 15.48, Philippe Mathieu-Daudé wrote:
> 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 <thuth@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   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 fef64accc1..0af8f32fa3 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)')

Reviewed-by: Thomas Huth <thuth@redhat.com>