Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatib…
…ility

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 f0a663b)
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()")
  • Loading branch information
philmd authored and Michael Tokarev committed Nov 29, 2023
1 parent dff5791 commit d9a0224
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docs/devel/testing.rst
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion tests/avocado/version.py
Expand Up @@ -21,4 +21,4 @@ def test_qmp_human_info_version(self):
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)')

0 comments on commit d9a0224

Please sign in to comment.