From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
"Thomas Huth" <thuth@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Erik Skultety" <eskultet@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Andrea Bolognani" <abologna@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"Stefan Hajnoczi" <stefanha@gmail.com>,
"Max Reitz" <mreitz@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Beraldo Leal" <bleal@redhat.com>
Subject: [PATCH 3/4] Acceptance Tests: introduce method to require a feature and option
Date: Tue, 8 Jun 2021 10:09:37 -0400 [thread overview]
Message-ID: <20210608140938.863580-4-crosa@redhat.com> (raw)
In-Reply-To: <20210608140938.863580-1-crosa@redhat.com>
In this context, and according to the qemu.utils.list_feature() utility
function, a feature is something is available as a QEMU command line
option that can take the "help" value.
This builds on top of that utility function, and allows test writers
to require, for instance, the "x-remote" (option) machine type
(feature).
This example is actually applied here to the reespective test, given
that the option is conditionally built, and the test will ERROR
without it.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 29 ++++++++++++++++++++++-
tests/acceptance/multiprocess.py | 1 +
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 93c4b9851f..432caff4e6 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -11,6 +11,7 @@
import logging
import os
import shutil
+import subprocess
import sys
import uuid
import tempfile
@@ -45,7 +46,8 @@
from qemu.utils import (
get_info_usernet_hostfwd_port,
kvm_available,
- tcg_available,
+ list_feature,
+ tcg_available
)
def is_readable_executable_file(path):
@@ -182,6 +184,31 @@ def _get_unique_tag_val(self, tag_name):
return vals.pop()
return None
+ def require_feature(self, feature, option=None):
+ """
+ Requires a feature to be available for the test to continue
+
+ It takes into account the currently set qemu binary, and only checks
+ for by running a "qemu -$feature help" command. If the specific option
+ is given, it checks if it's listed for the given feature.
+
+ If the check fails, the test is canceled.
+
+ :param feature: name of a QEMU feature, such as "accel" or "machine"
+ :type feature: str
+ :param option: the specific value for the feature. For instance,
+ if feature is "machine", option can be "q35".
+ type option: str
+ """
+ try:
+ options_available = list_feature(self.qemu_bin, feature)
+ except subprocess.CalledProcessError:
+ self.cancel('Feature "%s" does not appear to be present.' % feature)
+ if option is not None:
+ if option not in options_available:
+ self.cancel('Feature "%s" does not have "%s" as an option' %
+ (feature, option))
+
def require_accelerator(self, accelerator):
"""
Requires an accelerator to be available for the test to continue
diff --git a/tests/acceptance/multiprocess.py b/tests/acceptance/multiprocess.py
index 96627f022a..4d8a40a510 100644
--- a/tests/acceptance/multiprocess.py
+++ b/tests/acceptance/multiprocess.py
@@ -22,6 +22,7 @@ def do_test(self, kernel_url, initrd_url, kernel_command_line,
machine_type):
"""Main test method"""
self.require_accelerator('kvm')
+ self.require_feature('machine', 'x-remote')
# Create socketpair to connect proxy and remote processes
proxy_sock, remote_sock = socket.socketpair(socket.AF_UNIX,
--
2.25.4
next prev parent reply other threads:[~2021-06-08 14:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 14:09 [PATCH 0/4] Jobs based on custom runners: add CentOS Stream 8 Cleber Rosa
2021-06-08 14:09 ` [PATCH 1/4] block.c: fix compilation error on possible unitialized variable Cleber Rosa
2021-06-09 7:08 ` Thomas Huth
2021-06-08 14:09 ` [PATCH 2/4] Python QEMU utils: introduce a generic feature list Cleber Rosa
2021-06-08 21:42 ` Wainer dos Santos Moschetta
2021-06-08 23:55 ` Cleber Rosa Junior
2021-06-10 19:39 ` Willian Rampazzo
2021-06-10 20:31 ` Wainer dos Santos Moschetta
2021-06-10 19:48 ` Willian Rampazzo
2021-06-22 15:43 ` John Snow
2021-06-08 14:09 ` Cleber Rosa [this message]
2021-06-10 19:46 ` [PATCH 3/4] Acceptance Tests: introduce method to require a feature and option Willian Rampazzo
2021-06-08 14:09 ` [PATCH 4/4] Jobs based on custom runners: add CentOS Stream 8 Cleber Rosa
2021-06-09 20:37 ` Cleber Rosa Junior
2021-06-10 19:27 ` Willian Rampazzo
2021-06-10 18:40 ` [PATCH 0/4] " Willian Rampazzo
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=20210608140938.863580-4-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=abologna@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=bleal@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eskultet@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
--cc=wrampazz@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).