[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/9] tests/avocado: Extract QemuBaseTest from Test
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 3/9] tests/avocado: Extract QemuBaseTest from Test |
Date: |
Mon, 8 Nov 2021 17:17:33 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The Avocado Test::fetch_asset() is handy to download artifacts
before running tests. The current class is named Test but only
tests system emulation. As we want to test user emulation,
refactor the common code as QemuBaseTest.
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211105143416.148332-2-f4bug@amsat.org>
---
tests/avocado/avocado_qemu/__init__.py | 72 +++++++++++++++-----------
1 file changed, 41 insertions(+), 31 deletions(-)
diff --git a/tests/avocado/avocado_qemu/__init__.py
b/tests/avocado/avocado_qemu/__init__.py
index cd21b59e040..a495e106d03 100644
--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
@@ -169,7 +169,7 @@ def exec_command_and_wait_for_pattern(test, command,
"""
_console_interaction(test, success_message, failure_message, command +
'\r')
-class Test(avocado.Test):
+class QemuBaseTest(avocado.Test):
def _get_unique_tag_val(self, tag_name):
"""
Gets a tag value, if unique for a key
@@ -179,6 +179,46 @@ def _get_unique_tag_val(self, tag_name):
return vals.pop()
return None
+ def setUp(self):
+ self.arch = self.params.get('arch',
+ default=self._get_unique_tag_val('arch'))
+
+ self.cpu = self.params.get('cpu',
+ default=self._get_unique_tag_val('cpu'))
+
+ default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
+ self.qemu_bin = self.params.get('qemu_bin',
+ default=default_qemu_bin)
+ if self.qemu_bin is None:
+ self.cancel("No QEMU binary defined or found in the build tree")
+
+ def fetch_asset(self, name,
+ asset_hash=None, algorithm=None,
+ locations=None, expire=None,
+ find_only=False, cancel_on_missing=True):
+ return super().fetch_asset(name,
+ asset_hash=asset_hash,
+ algorithm=algorithm,
+ locations=locations,
+ expire=expire,
+ find_only=find_only,
+ cancel_on_missing=cancel_on_missing)
+
+
+class Test(QemuBaseTest):
+ """Facilitates system emulation tests.
+
+ TODO: Rename this class as `QemuSystemTest`.
+ """
+
+ def setUp(self):
+ self._vms = {}
+
+ super().setUp()
+
+ self.machine = self.params.get('machine',
+
default=self._get_unique_tag_val('machine'))
+
def require_accelerator(self, accelerator):
"""
Requires an accelerator to be available for the test to continue
@@ -201,24 +241,6 @@ def require_accelerator(self, accelerator):
self.cancel("%s accelerator does not seem to be "
"available" % accelerator)
- def setUp(self):
- self._vms = {}
-
- self.arch = self.params.get('arch',
- default=self._get_unique_tag_val('arch'))
-
- self.cpu = self.params.get('cpu',
- default=self._get_unique_tag_val('cpu'))
-
- self.machine = self.params.get('machine',
-
default=self._get_unique_tag_val('machine'))
-
- default_qemu_bin = pick_default_qemu_bin(arch=self.arch)
- self.qemu_bin = self.params.get('qemu_bin',
- default=default_qemu_bin)
- if self.qemu_bin is None:
- self.cancel("No QEMU binary defined or found in the build tree")
-
def _new_vm(self, name, *args):
self._sd = tempfile.TemporaryDirectory(prefix="avo_qemu_sock_")
vm = QEMUMachine(self.qemu_bin, base_temp_dir=self.workdir,
@@ -272,18 +294,6 @@ def tearDown(self):
self._sd = None
super().tearDown()
- def fetch_asset(self, name,
- asset_hash=None, algorithm=None,
- locations=None, expire=None,
- find_only=False, cancel_on_missing=True):
- return super().fetch_asset(name,
- asset_hash=asset_hash,
- algorithm=algorithm,
- locations=locations,
- expire=expire,
- find_only=find_only,
- cancel_on_missing=cancel_on_missing)
-
class LinuxSSHMixIn:
"""Contains utility methods for interacting with a guest via SSH."""
--
2.31.1
- [PULL 0/9] Integration testing patches for 2021-11-08, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 1/9] tests/acceptance: introduce new check-avocado target, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 3/9] tests/avocado: Extract QemuBaseTest from Test,
Philippe Mathieu-Daudé <=
- [PULL 2/9] tests/acceptance: rename tests acceptance to tests avocado, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 4/9] tests/avocado: Make pick_default_qemu_bin() more generic, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 6/9] tests/avocado: Share useful helpers from virtiofs_submounts test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 5/9] tests/avocado: Introduce QemuUserTest base class, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 7/9] tests/avocado: Add bFLT loader linux-user test, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 8/9] tests/avocado: Rename avocado_qemu.Test -> QemuSystemTest, Philippe Mathieu-Daudé, 2021/11/08
- [PULL 9/9] tests/avocado: Remove p7zip binary availability check, Philippe Mathieu-Daudé, 2021/11/08
- Re: [PULL 0/9] Integration testing patches for 2021-11-08, Richard Henderson, 2021/11/08