diff options
author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-11-14 15:48:31 +0100 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2023-11-29 16:20:11 +0300 |
commit | d9a0224b2a2e5c4310de51f4b70af9b04e561727 (patch) | |
tree | 6c6899a9594355480e3e7b8fc943be0c210fe121 | |
parent | dff579171c529f0330325f00370f131a2eab3a1b (diff) |
tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility
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>
Message-ID: <20231114144832.71612-1-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit f0a663b4ced2bf315936c774c2b6ff398fce8905)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(Mjt: adjust context for before v8.1.0-1582-g684750ab4f
"python/qemu: rename command() to cmd()")
-rw-r--r-- | docs/devel/testing.rst | 2 | ||||
-rw-r--r-- | 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 8cad156aa0..98c26ecf18 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -990,7 +990,7 @@ class. Here's a simple usage example: self.vm.launch() res = self.vm.command('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 ded7f039c1..5f88ff300b 100644 --- a/tests/avocado/version.py +++ b/tests/avocado/version.py @@ -21,4 +21,4 @@ class Version(QemuSystemTest): self.vm.launch() res = self.vm.command('human-monitor-command', command_line='info version') - self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') + self.assertRegex(res, r'^(\d+\.\d+\.\d)') |