Re: [PATCH v2 05/23] tests/functional: Convert simple avocado tests into standalone python tests

[Philippe Mathieu-Daudé]

On 24/7/24 19:52, Thomas Huth wrote:

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é <berra...@redhat.com>
Signed-off-by: Thomas Huth <th...@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

diff --git a/tests/avocado/mem-addr-space-check.py 
b/tests/functional/test_mem_addr_space.py
old mode 100644
new mode 100755
similarity index 93%
rename from tests/avocado/mem-addr-space-check.py
rename to tests/functional/test_mem_addr_space.py
index d3974599f4..bb0cf062ca
--- a/tests/avocado/mem-addr-space-check.py
+++ b/tests/functional/test_mem_addr_space.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+#
  # Check for crash when using memory beyond the available guest processor
  # address space.
  #
@@ -8,7 +10,7 @@
  #
  # SPDX-License-Identifier: GPL-2.0-or-later

-from avocado_qemu import QemuSystemTest

+from qemu_test import QemuSystemTest
  import time

class MemAddrCheck(QemuSystemTest):

@@ -22,9 +24,6 @@ class MemAddrCheck(QemuSystemTest):
      # for all 32-bit cases, pci64_hole_size is 0.
      def test_phybits_low_pse36(self):
          """
-        :avocado: tags=machine:q35

Pre-existing, we should use set_machine('q35') in this file tests.
(Can be cleaned later.)

Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>