aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCleber Rosa <crosa@redhat.com>2019-09-24 15:45:00 -0400
committerCleber Rosa <crosa@redhat.com>2019-12-16 11:12:16 -0500
commitf108934fca0a5d6acfc93be6d3684574d18794e2 (patch)
treea4c7ba06e970c8ca85330ea367aed7ddd3510e5f
parent3e9c1810c65f8338a863d1e59fa0efedc884e915 (diff)
downloadqemu-f108934fca0a5d6acfc93be6d3684574d18794e2.zip
qemu-f108934fca0a5d6acfc93be6d3684574d18794e2.tar.gz
qemu-f108934fca0a5d6acfc93be6d3684574d18794e2.tar.bz2
Acceptance tests: introduce utility method for tags unique vals
Currently a test can describe the target architecture binary that it should primarily be run with, be setting a single tag value. The same approach is expected to be done with other QEMU aspects to be tested, for instance, the machine type and accelerator, so let's generalize the logic into a utility method. Signed-off-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20190924194501.9303-3-crosa@redhat.com> Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Cleber Rosa <crosa@redhat.com>
-rw-r--r--tests/acceptance/avocado_qemu/__init__.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 9a57c02..e676d9c 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -100,14 +100,21 @@ def exec_command_and_wait_for_pattern(test, command,
class Test(avocado.Test):
+ def _get_unique_tag_val(self, tag_name):
+ """
+ Gets a tag value, if unique for a key
+ """
+ vals = self.tags.get(tag_name, [])
+ if len(vals) == 1:
+ return vals.pop()
+ return None
+
def setUp(self):
self._vms = {}
- arches = self.tags.get('arch', [])
- if len(arches) == 1:
- arch = arches.pop()
- else:
- arch = None
- self.arch = self.params.get('arch', default=arch)
+
+ self.arch = self.params.get('arch',
+ default=self._get_unique_tag_val('arch'))
+
default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
self.qemu_bin = self.params.get('qemu_bin',
default=default_qemu_bin)