docs/devel/testing.rst | 2 +- tests/avocado/cpu_queries.py | 2 +- tests/avocado/empty_cpu_model.py | 2 +- tests/avocado/pc_cpu_hotplug_props.py | 2 +- tests/avocado/x86_cpu_model_versions.py | 96 ++++++++++++------------- 5 files changed, 52 insertions(+), 52 deletions(-)
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 <thuth@redhat.com>
---
docs/devel/testing.rst | 2 +-
tests/avocado/cpu_queries.py | 2 +-
tests/avocado/empty_cpu_model.py | 2 +-
tests/avocado/pc_cpu_hotplug_props.py | 2 +-
tests/avocado/x86_cpu_model_versions.py | 96 ++++++++++++-------------
5 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index fef64accc1..87ed30af22 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -1077,7 +1077,7 @@ and hypothetical example follows:
'human-monitor-command',
command_line='info version')
- self.assertEquals(first_res, second_res, third_res)
+ self.assertEqual(first_res, second_res, third_res)
At test "tear down", ``avocado_qemu.Test`` handles all the QEMUMachines
shutdown.
diff --git a/tests/avocado/cpu_queries.py b/tests/avocado/cpu_queries.py
index 86c2d5c92d..d3faa14720 100644
--- a/tests/avocado/cpu_queries.py
+++ b/tests/avocado/cpu_queries.py
@@ -32,4 +32,4 @@ def test(self):
model = {'name': c['name']}
e = self.vm.cmd('query-cpu-model-expansion', model=model,
type='full')
- self.assertEquals(e['model']['name'], c['name'])
+ self.assertEqual(e['model']['name'], c['name'])
diff --git a/tests/avocado/empty_cpu_model.py b/tests/avocado/empty_cpu_model.py
index 22f504418d..d906ef3d3c 100644
--- a/tests/avocado/empty_cpu_model.py
+++ b/tests/avocado/empty_cpu_model.py
@@ -15,5 +15,5 @@ def test(self):
self.vm.set_qmp_monitor(enabled=False)
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'-cpu option cannot be empty')
diff --git a/tests/avocado/pc_cpu_hotplug_props.py b/tests/avocado/pc_cpu_hotplug_props.py
index b56f51d02a..4bd3e02665 100644
--- a/tests/avocado/pc_cpu_hotplug_props.py
+++ b/tests/avocado/pc_cpu_hotplug_props.py
@@ -32,4 +32,4 @@ def test_no_die_id(self):
self.vm.add_args('-smp', '1,sockets=2,cores=2,threads=2,maxcpus=8')
self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0')
self.vm.launch()
- self.assertEquals(len(self.vm.cmd('query-cpus-fast')), 2)
+ self.assertEqual(len(self.vm.cmd('query-cpus-fast')), 2)
diff --git a/tests/avocado/x86_cpu_model_versions.py b/tests/avocado/x86_cpu_model_versions.py
index 9e07b8a55d..9d6df4af7d 100644
--- a/tests/avocado/x86_cpu_model_versions.py
+++ b/tests/avocado/x86_cpu_model_versions.py
@@ -121,94 +121,94 @@ def test_4_1_alias(self):
self.assertFalse(cpus['Cascadelake-Server']['static'],
'unversioned Cascadelake-Server CPU model must not be static')
- self.assertEquals(cpus['Cascadelake-Server'].get('alias-of'), 'Cascadelake-Server-v1',
- 'Cascadelake-Server must be an alias of Cascadelake-Server-v1')
+ self.assertEqual(cpus['Cascadelake-Server'].get('alias-of'), 'Cascadelake-Server-v1',
+ 'Cascadelake-Server must be an alias of Cascadelake-Server-v1')
self.assertNotIn('alias-of', cpus['Cascadelake-Server-v1'],
'Cascadelake-Server-v1 must not be an alias')
self.assertFalse(cpus['qemu64']['static'],
'unversioned qemu64 CPU model must not be static')
- self.assertEquals(cpus['qemu64'].get('alias-of'), 'qemu64-v1',
- 'qemu64 must be an alias of qemu64-v1')
+ self.assertEqual(cpus['qemu64'].get('alias-of'), 'qemu64-v1',
+ 'qemu64 must be an alias of qemu64-v1')
self.assertNotIn('alias-of', cpus['qemu64-v1'],
'qemu64-v1 must not be an alias')
self.validate_variant_aliases(cpus)
# On pc-*-4.1, -noTSX and -IBRS models should be aliases:
- self.assertEquals(cpus["Haswell"].get('alias-of'),
- "Haswell-v1",
+ self.assertEqual(cpus["Haswell"].get('alias-of'),
+ "Haswell-v1",
"Haswell must be an alias")
- self.assertEquals(cpus["Haswell-noTSX"].get('alias-of'),
- "Haswell-v2",
+ self.assertEqual(cpus["Haswell-noTSX"].get('alias-of'),
+ "Haswell-v2",
"Haswell-noTSX must be an alias")
- self.assertEquals(cpus["Haswell-IBRS"].get('alias-of'),
- "Haswell-v3",
+ self.assertEqual(cpus["Haswell-IBRS"].get('alias-of'),
+ "Haswell-v3",
"Haswell-IBRS must be an alias")
- self.assertEquals(cpus["Haswell-noTSX-IBRS"].get('alias-of'),
- "Haswell-v4",
+ self.assertEqual(cpus["Haswell-noTSX-IBRS"].get('alias-of'),
+ "Haswell-v4",
"Haswell-noTSX-IBRS must be an alias")
- self.assertEquals(cpus["Broadwell"].get('alias-of'),
- "Broadwell-v1",
+ self.assertEqual(cpus["Broadwell"].get('alias-of'),
+ "Broadwell-v1",
"Broadwell must be an alias")
- self.assertEquals(cpus["Broadwell-noTSX"].get('alias-of'),
- "Broadwell-v2",
+ self.assertEqual(cpus["Broadwell-noTSX"].get('alias-of'),
+ "Broadwell-v2",
"Broadwell-noTSX must be an alias")
- self.assertEquals(cpus["Broadwell-IBRS"].get('alias-of'),
- "Broadwell-v3",
+ self.assertEqual(cpus["Broadwell-IBRS"].get('alias-of'),
+ "Broadwell-v3",
"Broadwell-IBRS must be an alias")
- self.assertEquals(cpus["Broadwell-noTSX-IBRS"].get('alias-of'),
- "Broadwell-v4",
+ self.assertEqual(cpus["Broadwell-noTSX-IBRS"].get('alias-of'),
+ "Broadwell-v4",
"Broadwell-noTSX-IBRS must be an alias")
- self.assertEquals(cpus["Nehalem"].get('alias-of'),
- "Nehalem-v1",
+ self.assertEqual(cpus["Nehalem"].get('alias-of'),
+ "Nehalem-v1",
"Nehalem must be an alias")
- self.assertEquals(cpus["Nehalem-IBRS"].get('alias-of'),
- "Nehalem-v2",
+ self.assertEqual(cpus["Nehalem-IBRS"].get('alias-of'),
+ "Nehalem-v2",
"Nehalem-IBRS must be an alias")
- self.assertEquals(cpus["Westmere"].get('alias-of'),
- "Westmere-v1",
+ self.assertEqual(cpus["Westmere"].get('alias-of'),
+ "Westmere-v1",
"Westmere must be an alias")
- self.assertEquals(cpus["Westmere-IBRS"].get('alias-of'),
- "Westmere-v2",
+ self.assertEqual(cpus["Westmere-IBRS"].get('alias-of'),
+ "Westmere-v2",
"Westmere-IBRS must be an alias")
- self.assertEquals(cpus["SandyBridge"].get('alias-of'),
- "SandyBridge-v1",
+ self.assertEqual(cpus["SandyBridge"].get('alias-of'),
+ "SandyBridge-v1",
"SandyBridge must be an alias")
- self.assertEquals(cpus["SandyBridge-IBRS"].get('alias-of'),
- "SandyBridge-v2",
+ self.assertEqual(cpus["SandyBridge-IBRS"].get('alias-of'),
+ "SandyBridge-v2",
"SandyBridge-IBRS must be an alias")
- self.assertEquals(cpus["IvyBridge"].get('alias-of'),
- "IvyBridge-v1",
+ self.assertEqual(cpus["IvyBridge"].get('alias-of'),
+ "IvyBridge-v1",
"IvyBridge must be an alias")
- self.assertEquals(cpus["IvyBridge-IBRS"].get('alias-of'),
- "IvyBridge-v2",
+ self.assertEqual(cpus["IvyBridge-IBRS"].get('alias-of'),
+ "IvyBridge-v2",
"IvyBridge-IBRS must be an alias")
- self.assertEquals(cpus["Skylake-Client"].get('alias-of'),
- "Skylake-Client-v1",
+ self.assertEqual(cpus["Skylake-Client"].get('alias-of'),
+ "Skylake-Client-v1",
"Skylake-Client must be an alias")
- self.assertEquals(cpus["Skylake-Client-IBRS"].get('alias-of'),
- "Skylake-Client-v2",
+ self.assertEqual(cpus["Skylake-Client-IBRS"].get('alias-of'),
+ "Skylake-Client-v2",
"Skylake-Client-IBRS must be an alias")
- self.assertEquals(cpus["Skylake-Server"].get('alias-of'),
- "Skylake-Server-v1",
+ self.assertEqual(cpus["Skylake-Server"].get('alias-of'),
+ "Skylake-Server-v1",
"Skylake-Server must be an alias")
- self.assertEquals(cpus["Skylake-Server-IBRS"].get('alias-of'),
- "Skylake-Server-v2",
+ self.assertEqual(cpus["Skylake-Server-IBRS"].get('alias-of'),
+ "Skylake-Server-v2",
"Skylake-Server-IBRS must be an alias")
- self.assertEquals(cpus["EPYC"].get('alias-of'),
- "EPYC-v1",
+ self.assertEqual(cpus["EPYC"].get('alias-of'),
+ "EPYC-v1",
"EPYC must be an alias")
- self.assertEquals(cpus["EPYC-IBPB"].get('alias-of'),
- "EPYC-v2",
+ self.assertEqual(cpus["EPYC-IBPB"].get('alias-of'),
+ "EPYC-v2",
"EPYC-IBPB must be an alias")
self.validate_aliases(cpus)
--
2.41.0Hi Thomas, On 14/11/23 14:43, Thomas Huth wrote: > 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 From this list I see assertEquals() has been deprecated in 3.2, along with assertRegexpMatches(). No warning for this single use? tests/avocado/version.py:25: self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') Otherwise, Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > docs/devel/testing.rst | 2 +- > tests/avocado/cpu_queries.py | 2 +- > tests/avocado/empty_cpu_model.py | 2 +- > tests/avocado/pc_cpu_hotplug_props.py | 2 +- > tests/avocado/x86_cpu_model_versions.py | 96 ++++++++++++------------- > 5 files changed, 52 insertions(+), 52 deletions(-)
On 14/11/2023 15.10, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > On 14/11/23 14:43, Thomas Huth wrote: >> 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 > > From this list I see assertEquals() has been deprecated in 3.2, along > with assertRegexpMatches(). No warning for this single use? > > tests/avocado/version.py:25: self.assertRegexpMatches(res, > r'^(\d+\.\d+\.\d)') > > Otherwise, > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Thanks! I still cannot run all avocado tests yet, so I didn't notice this problem yet. But you're right, if I only run this test manually, it also fails. Care to send a patch, or want me to include it in my patch? Anyway, I'm seeing also failures here: tests/avocado/replay_kernel.py:ReplayKernelNormal.test_x86_64_pc: INTERRUPTED tests/avocado/reverse_debugging.py:ReverseDebugging_ppc64.test_ppc64_pseries: INTERRUPTED tests/avocado/reverse_debugging.py:ReverseDebugging_ppc64.test_ppc64_powernv: ERROR Are these still working for you? (IIRC at least the replay_kernel test was also failing for me before I upgraded to Fedora 39, so it's likely not related to the new Python version) Thomas
On 14/11/23 15:21, Thomas Huth wrote: > On 14/11/2023 15.10, Philippe Mathieu-Daudé wrote: >> Hi Thomas, >> >> On 14/11/23 14:43, Thomas Huth wrote: >>> 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 >> >> From this list I see assertEquals() has been deprecated in 3.2, along >> with assertRegexpMatches(). No warning for this single use? >> >> tests/avocado/version.py:25: self.assertRegexpMatches(res, >> r'^(\d+\.\d+\.\d)') >> >> Otherwise, >> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > > Thanks! > > I still cannot run all avocado tests yet, so I didn't notice this problem > yet. At least you can run *some* tests :> FYI macOS users still can't run QEMU's Avocado test suite. Personally I run it somewhere in a cloud machine. > But you're right, if I only run this test manually, it also fails. > Care to send a patch, or want me to include it in my patch? OK I'll send. > Anyway, I'm seeing also failures here: > > tests/avocado/replay_kernel.py:ReplayKernelNormal.test_x86_64_pc: > INTERRUPTED > tests/avocado/reverse_debugging.py:ReverseDebugging_ppc64.test_ppc64_pseries: INTERRUPTED Sometimes due to timeout. > tests/avocado/reverse_debugging.py:ReverseDebugging_ppc64.test_ppc64_powernv: ERROR This one is concerning. > Are these still working for you? > (IIRC at least the replay_kernel test was also failing for me > before I upgraded to Fedora 39, so it's likely not related to > the new Python version) Regards, Phil.
© 2016 - 2024 Red Hat, Inc.