[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 0/3] tests/acceptance: Handle tests with "cpu" tag

From: Wainer dos Santos Moschetta
Subject: [PATCH 0/3] tests/acceptance: Handle tests with "cpu" tag
Date: Wed, 24 Feb 2021 18:26:51 -0300

Currently the acceptance tests tagged with "machine" have the "-M TYPE"
automatically added to the list of arguments of the QEMUMachine object.
In other words, that option is passed to the launched QEMU. On this
series it is implemented the same feature but instead for tests marked
with "cpu".

There is a caveat, however, in case the test needs additional arguments to
the CPU type they cannot be passed via tag, because the tags parser split
values by comma. For example, in tests/acceptance/x86_cpu_model_versions.py,
there are cases where:

  * -cpu is set to 
  * if it was tagged like 
    then the parser would break it into 4 tags ("cpu:Cascadelake-Server",
    "x-force-features=on", "check=off", "enforce=off")
  * resulting on "-cpu Cascadelake-Server" and the remaining arguments are 

For the example above, one should tag it (or not at all) as 
AND self.vm.add_args('-cpu', 
and that results on something like:

  "qemu-system-x86_64 (...) -cpu Cascadelake-Server -cpu 

QEMU is going to ignore the first -cpu argument. See the patch 0003 for a 

This series was tested on CI 
and with the following code:

from avocado_qemu import Test

class CPUTest(Test):
    def test_cpu(self):
        :avocado: tags=cpu:host
        # The cpu property is set to the tag value, or None on its absence
        self.assertEqual(self.cpu, "host")
        # The created VM has the '-cpu host' option
        self.assertIn("-cpu host", " ".join(self.vm._args))

    def test_cpu_none(self):
        self.assertEqual(self.cpu, None)
        self.assertNotIn('-cpu', self.vm._args)

Wainer dos Santos Moschetta (3):
  tests/acceptance: Automatic set -cpu to the test vm
  tests/acceptance: Let the framework handle "cpu:VALUE" tagged tests
  tests/acceptance: Tagging tests with "cpu:VALUE"

 docs/devel/testing.rst                     |  8 ++++++++
 tests/acceptance/avocado_qemu/__init__.py  |  4 ++++
 tests/acceptance/boot_linux.py             |  3 ---
 tests/acceptance/boot_linux_console.py     | 16 +++++++++-------
 tests/acceptance/machine_mips_malta.py     |  7 +++----
 tests/acceptance/pc_cpu_hotplug_props.py   |  2 +-
 tests/acceptance/replay_kernel.py          | 17 +++++++++--------
 tests/acceptance/reverse_debugging.py      |  2 +-
 tests/acceptance/tcg_plugins.py            | 15 +++++++--------
 tests/acceptance/virtio-gpu.py             |  4 ++--
 tests/acceptance/x86_cpu_model_versions.py |  8 ++++++++
 11 files changed, 52 insertions(+), 34 deletions(-)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]