mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
tests/avocado: Rename avocado_qemu.Test -> QemuSystemTest
To run user-mode emulation tests, we introduced the avocado_qemu.QemuUserTest which inherits from avocado_qemu.QemuBaseTest. System-mode emulation tests are based on the avocado_qemu.Test class, which also inherits avocado_qemu.QemuBaseTest. To avoid confusion, rename it as avocado_qemu.QemuSystemTest. Suggested-by: Wainer dos Santos Moschetta <wainersm@redhat.com> Reviewed-by: Willian Rampazzo <willianr@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20211105143416.148332-7-f4bug@amsat.org>
This commit is contained in:
parent
8011837a01
commit
2283b627bc
35 changed files with 80 additions and 82 deletions
|
@ -176,7 +176,7 @@ def interrupt_interactive_console_until_pattern(test, success_message,
|
|||
|
||||
:param test: an Avocado test containing a VM that will have its console
|
||||
read and probed for a success or failure message
|
||||
:type test: :class:`avocado_qemu.Test`
|
||||
:type test: :class:`avocado_qemu.QemuSystemTest`
|
||||
:param success_message: if this message appears, test succeeds
|
||||
:param failure_message: if this message appears, test fails
|
||||
:param interrupt_string: a string to send to the console before trying
|
||||
|
@ -192,7 +192,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None,
|
|||
|
||||
:param test: an Avocado test containing a VM that will have its console
|
||||
read and probed for a success or failure message
|
||||
:type test: :class:`avocado_qemu.Test`
|
||||
:type test: :class:`avocado_qemu.QemuSystemTest`
|
||||
:param success_message: if this message appears, test succeeds
|
||||
:param failure_message: if this message appears, test fails
|
||||
"""
|
||||
|
@ -204,7 +204,7 @@ def exec_command(test, command):
|
|||
the content.
|
||||
|
||||
:param test: an Avocado test containing a VM.
|
||||
:type test: :class:`avocado_qemu.Test`
|
||||
:type test: :class:`avocado_qemu.QemuSystemTest`
|
||||
:param command: the command to send
|
||||
:type command: str
|
||||
"""
|
||||
|
@ -219,7 +219,7 @@ def exec_command_and_wait_for_pattern(test, command,
|
|||
|
||||
:param test: an Avocado test containing a VM that will have its console
|
||||
read and probed for a success or failure message
|
||||
:type test: :class:`avocado_qemu.Test`
|
||||
:type test: :class:`avocado_qemu.QemuSystemTest`
|
||||
:param command: the command to send
|
||||
:param success_message: if this message appears, test succeeds
|
||||
:param failure_message: if this message appears, test fails
|
||||
|
@ -262,11 +262,8 @@ class QemuBaseTest(avocado.Test):
|
|||
cancel_on_missing=cancel_on_missing)
|
||||
|
||||
|
||||
class Test(QemuBaseTest):
|
||||
"""Facilitates system emulation tests.
|
||||
|
||||
TODO: Rename this class as `QemuSystemTest`.
|
||||
"""
|
||||
class QemuSystemTest(QemuBaseTest):
|
||||
"""Facilitates system emulation tests."""
|
||||
|
||||
def setUp(self):
|
||||
self._vms = {}
|
||||
|
@ -508,11 +505,11 @@ class LinuxDistro:
|
|||
return self._info.get('kernel_params', None)
|
||||
|
||||
|
||||
class LinuxTest(LinuxSSHMixIn, Test):
|
||||
class LinuxTest(LinuxSSHMixIn, QemuSystemTest):
|
||||
"""Facilitates having a cloud-image Linux based available.
|
||||
|
||||
For tests that indend to interact with guests, this is a better choice
|
||||
to start with than the more vanilla `Test` class.
|
||||
For tests that indent to interact with guests, this is a better choice
|
||||
to start with than the more vanilla `QemuSystemTest` class.
|
||||
"""
|
||||
|
||||
timeout = 900
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue