SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Acceptance tests: Extract _console_interaction()

Browse Source 
Since we are going to re-use the code shared between
wait_for_console_pattern() and exec_command_and_wait_for_pattern(),
extract the common part into a local function.

Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Tested-by: Liam Merwick <liam.merwick@oracle.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20200120235159.18510-3-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-01-21 00:51:54 +01:00 committed by Philippe Mathieu-Daudé
parent 746f244d97
commit a91ba1d3ef
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/acceptance/avocado_qemu/__init__.py
View File

@ -55,19 +55,14 @@ def pick_default_qemu_bin(arch=None):
return qemu_bin_from_src_dir_path return qemu_bin_from_src_dir_path
def wait_for_console_pattern(test, success_message, failure_message=None): def _console_interaction(test, success_message, failure_message,
""" send_string):
Waits for messages to appear on the console, while logging the content
: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`
:param success_message: if this message appears, test succeeds
:param failure_message: if this message appears, test fails
"""
console = test.vm.console_socket.makefile() console = test.vm.console_socket.makefile()
console_logger = logging.getLogger('console') console_logger = logging.getLogger('console')
while True: while True:
if send_string:
test.vm.console_socket.sendall(send_string.encode())
send_string = None # send only once
msg = console.readline().strip() msg = console.readline().strip()
if not msg: if not msg:
continue continue
@ -79,6 +74,17 @@ def wait_for_console_pattern(test, success_message, failure_message=None):
fail = 'Failure message found in console: %s' % failure_message fail = 'Failure message found in console: %s' % failure_message
test.fail(fail) test.fail(fail)
def wait_for_console_pattern(test, success_message, failure_message=None):
"""
Waits for messages to appear on the console, while logging the content
: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`
:param success_message: if this message appears, test succeeds
:param failure_message: if this message appears, test fails
"""
_console_interaction(test, success_message, failure_message, None)
def exec_command_and_wait_for_pattern(test, command, def exec_command_and_wait_for_pattern(test, command,
success_message, failure_message=None): success_message, failure_message=None):
@ -94,10 +100,7 @@ def exec_command_and_wait_for_pattern(test, command,
:param success_message: if this message appears, test succeeds :param success_message: if this message appears, test succeeds
:param failure_message: if this message appears, test fails :param failure_message: if this message appears, test fails
""" """
command += '\r' _console_interaction(test, success_message, failure_message, command + '\r')
test.vm.console_socket.sendall(command.encode())
wait_for_console_pattern(test, success_message, failure_message)
class Test(avocado.Test): class Test(avocado.Test):
def _get_unique_tag_val(self, tag_name): def _get_unique_tag_val(self, tag_name):