Specify target VM for exec_command and
exec_command_and_wait_for_pattern routines
Signed-off-by: Elena Ufimtseva <elena.ufimts...@oracle.com>
Signed-off-by: John G Johnson <john.g.john...@oracle.com>
Signed-off-by: Jagannathan Raman <jag.ra...@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: Beraldo Leal <bl...@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
---
tests/avocado/avocado_qemu/__init__.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/avocado/avocado_qemu/__init__.py
b/tests/avocado/avocado_qemu/__init__.py
index ac85e36a4d..18a34a798c 100644
--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
@@ -198,7 +198,7 @@ def wait_for_console_pattern(test, success_message,
failure_message=None,
"""
_console_interaction(test, success_message, failure_message, None, vm=vm)
-def exec_command(test, command):
+def exec_command(test, command, vm=None):
"""
Send a command to a console (appending CRLF characters), while logging
the content.
@@ -207,11 +207,14 @@ def exec_command(test, command):
:type test: :class:`avocado_qemu.QemuSystemTest`
:param command: the command to send
:type command: str
+ :param vm: target vm
+ :type vm: :class:`qemu.machine.QEMUMachine`
"""
- _console_interaction(test, None, None, command + '\r')
+ _console_interaction(test, None, None, command + '\r', vm=vm)
def exec_command_and_wait_for_pattern(test, command,
- success_message, failure_message=None):
+ success_message, failure_message=None,
+ vm=None):
"""
Send a command to a console (appending CRLF characters), then wait
for success_message to appear on the console, while logging the.
@@ -223,8 +226,11 @@ def exec_command_and_wait_for_pattern(test, command,
:param command: the command to send
:param success_message: if this message appears, test succeeds
:param failure_message: if this message appears, test fails
+ :param vm: target vm
+ :type vm: :class:`qemu.machine.QEMUMachine`
"""
- _console_interaction(test, success_message, failure_message, command +
'\r')
+ _console_interaction(test, success_message, failure_message, command +
'\r',
+ vm=vm)
class QemuBaseTest(avocado.Test):
def _get_unique_tag_val(self, tag_name):
--
2.20.1
