From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 01/10] tests/avocado: Replace assertEquals() for Python 3.12 compatibility
Date: Thu, 16 Nov 2023 19:05:25 +0100 [thread overview]
Message-ID: <20231116180534.566469-2-thuth@redhat.com> (raw)
In-Reply-To: <20231116180534.566469-1-thuth@redhat.com>
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
Message-ID: <20231114134326.287242-1-thuth@redhat.com>
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 | 97 +++++++++++++------------
5 files changed, 53 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..11101e02b9 100644
--- a/tests/avocado/x86_cpu_model_versions.py
+++ b/tests/avocado/x86_cpu_model_versions.py
@@ -121,94 +121,95 @@ 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.0
next prev parent reply other threads:[~2023-11-16 18:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 18:05 [PULL 00/10] Avocado test fixes Thomas Huth
2023-11-16 18:05 ` Thomas Huth [this message]
2023-11-16 18:05 ` [PULL 02/10] tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility Thomas Huth
2023-11-16 18:05 ` [PULL 03/10] tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support Thomas Huth
2023-11-16 18:05 ` [PULL 04/10] tests/avocado/intel_iommu: Add asset hashes to avoid warnings Thomas Huth
2023-11-16 18:05 ` [PULL 05/10] tests/avocado/multiprocess: Add asset hashes to silence warnings Thomas Huth
2023-11-16 18:05 ` [PULL 06/10] tests/avocado: Make fetch_asset() unconditionally require a crypto hash Thomas Huth
2023-11-16 18:05 ` [PULL 07/10] tests/avocado/replay_kernel: Mark the test_x86_64_pc as flaky Thomas Huth
2023-11-16 18:05 ` [PULL 08/10] tests/avocado/mem-addr-space-check: Replace assertEquals() for Python 3.12 Thomas Huth
2023-11-16 18:05 ` [PULL 09/10] tests/avocado: reverse_debugging drain console to prevent hang Thomas Huth
2023-11-16 18:05 ` [PULL 10/10] tests/avocado: Enable reverse_debugging.py tests in gitlab CI Thomas Huth
2023-11-20 14:39 ` [PULL 00/10] Avocado test fixes Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231116180534.566469-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).