[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/15] Acceptance tests: introduce utility method for tags unique
From: |
Cleber Rosa |
Subject: |
[PULL 08/15] Acceptance tests: introduce utility method for tags unique vals |
Date: |
Tue, 17 Dec 2019 00:15:14 -0500 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Cleber Rosa <address@hidden>
---
tests/acceptance/avocado_qemu/__init__.py | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py
b/tests/acceptance/avocado_qemu/__init__.py
index 9a57c020d8..e676d9c4e7 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)
--
2.21.0
- [PULL 00/15] Python queue 2019-12-17, Cleber Rosa, 2019/12/17
- [PULL 01/15] tests/boot_linux_console: Fetch assets from Debian snapshot archives, Cleber Rosa, 2019/12/17
- [PULL 02/15] Revert "Acceptance test: cancel test if m68k kernel packages goes missing", Cleber Rosa, 2019/12/17
- [PULL 03/15] analyze-migration.py: fix find() type error, Cleber Rosa, 2019/12/17
- [PULL 04/15] analyze-migration.py: replace numpy with python 3.2, Cleber Rosa, 2019/12/17
- [PULL 05/15] python/qemu: Add set_qmp_monitor() to QEMUMachine, Cleber Rosa, 2019/12/17
- [PULL 06/15] tests/acceptance: Makes linux_initrd and empty_cpu_model use QEMUMachine, Cleber Rosa, 2019/12/17
- [PULL 07/15] Acceptance test x86_cpu_model_versions: use default vm, Cleber Rosa, 2019/12/17
- [PULL 08/15] Acceptance tests: introduce utility method for tags unique vals,
Cleber Rosa <=
- [PULL 09/15] Acceptance tests: use avocado tags for machine type, Cleber Rosa, 2019/12/17
- [PULL 10/15] Acceptance tests: use relative location for tests, Cleber Rosa, 2019/12/17
- [PULL 11/15] python/qemu: Move kvm_available() to its own module, Cleber Rosa, 2019/12/17
- [PULL 12/15] python/qemu: accel: Add list_accel() method, Cleber Rosa, 2019/12/17
- [PULL 13/15] python/qemu: accel: Strengthen kvm_available() checks, Cleber Rosa, 2019/12/17
- [PULL 14/15] python/qemu: accel: Add tcg_available() method, Cleber Rosa, 2019/12/17
- [PULL 15/15] python/qemu: Remove unneeded imports in __init__, Cleber Rosa, 2019/12/17
- Re: [PULL 00/15] Python queue 2019-12-17, Peter Maydell, 2019/12/17