Re: [PATCH v3 06/24] tests/functional: Convert simple avocado tests into standalone python tests

[Philippe Mathieu-Daudé]

On 30/7/24 19:03, Daniel P. Berrangé wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> These test are rather simple and don't need any modifications apart
> from adjusting the "from avocado_qemu" line. To ease debugging, make
> the files executable and add a shebang line and Python '__main__'
> handling, too, so that these tests can now be run by executing them
> directly.
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/functional/meson.build                  |  5 ++
>   .../test_cpu_queries.py}                      |  7 ++-
>   .../test_empty_cpu_model.py}                  |  7 ++-
>   .../test_mem_addr_space.py}                   | 52 +++----------------
>   .../test_pc_cpu_hotplug_props.py}             | 11 ++--
>   .../test_virtio_version.py}                   |  8 +--
>   6 files changed, 34 insertions(+), 56 deletions(-)
>   rename tests/{avocado/cpu_queries.py => functional/test_cpu_queries.py} (89%)
>   mode change 100644 => 100755
>   rename tests/{avocado/empty_cpu_model.py => 
> functional/test_empty_cpu_model.py} (84%)
>   mode change 100644 => 100755
>   rename tests/{avocado/mem-addr-space-check.py => 
> functional/test_mem_addr_space.py} (93%)
>   mode change 100644 => 100755
>   rename tests/{avocado/pc_cpu_hotplug_props.py => 
> functional/test_pc_cpu_hotplug_props.py} (90%)
>   mode change 100644 => 100755
>   rename tests/{avocado/virtio_version.py => functional/test_virtio_version.py} 
> (98%)
>   mode change 100644 => 100755

Please squash:

-- >8 --
diff --git a/MAINTAINERS b/MAINTAINERS
index 98eddf7ae1..a906218f9d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1830,6 +1832,9 @@ F: hw/isa/apm.c
 F: include/hw/isa/apm.h
 F: tests/unit/test-x86-topo.c
 F: tests/qtest/test-x86-cpuid-compat.c
+F: tests/functional/test_mem_addr_space.py
+F: tests/functional/test_pc_cpu_hotplug_props.py
+F: tests/functional/test_x86_cpu_model_versions.py

 PC Chipset
 M: Michael S. Tsirkin <mst@redhat.com>
@@ -1896,6 +1901,8 @@ F: include/hw/boards.h
 F: include/hw/core/cpu.h
 F: include/hw/cpu/cluster.h
 F: include/sysemu/numa.h
+F: tests/functional/test_cpu_queries.py
+F: tests/functional/test_empty_cpu_model.py
 F: tests/unit/test-smp-parse.c
 T: git https://gitlab.com/ehabkost/qemu.git machine-next

@@ -2236,6 +2244,7 @@ F: net/vhost-user.c
 F: include/hw/virtio/
 F: docs/devel/virtio*
 F: docs/devel/migration/virtio.rst
+F: tests/functional/test_virtio_version.py

 virtio-balloon
 M: Michael S. Tsirkin <mst@redhat.com>

diff --git a/tests/functional/test_x86_cpu_model_versions.py 
b/tests/functional/test_x86_cpu_model_versions.py
index a5f27c737d..a7294b4b92 100755
--- a/tests/functional/test_x86_cpu_model_versions.py
+++ b/tests/functional/test_x86_cpu_model_versions.py
@@ -217,7 +217,7 @@ def test_none_alias(self):
         """
         Check if unversioned CPU model is an alias pointing to some 
version
         """
-        self.machine = 'none'
+        self.set_machine('none')
         self.vm.add_args('-S')
         self.vm.launch()

---

Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>