mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 06:43:53 -06:00
Acceptance tests: refactor wait_for_console_pattern
The same utility method is already present in two different test files, so let's consolidate it into a single utility function. Signed-off-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20190916164011.7653-1-crosa@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> [PMD: failure_message is optional] Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> Message-Id: <20191028073441.6448-3-philmd@redhat.com> Signed-off-by: Cleber Rosa <crosa@redhat.com>
This commit is contained in:
parent
0858096702
commit
77bcd2487e
3 changed files with 33 additions and 37 deletions
|
@ -9,12 +9,12 @@
|
|||
# later. See the COPYING file in the top-level directory.
|
||||
|
||||
import os
|
||||
import logging
|
||||
import lzma
|
||||
import gzip
|
||||
import shutil
|
||||
|
||||
from avocado_qemu import Test
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
from avocado.utils import process
|
||||
from avocado.utils import archive
|
||||
|
||||
|
@ -29,31 +29,14 @@ class BootLinuxConsole(Test):
|
|||
|
||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||
|
||||
def wait_for_console_pattern(self, success_message,
|
||||
failure_message='Kernel panic - not syncing'):
|
||||
"""
|
||||
Waits for messages to appear on the console, while logging the content
|
||||
|
||||
:param success_message: if this message appears, test succeeds
|
||||
:param failure_message: if this message appears, test fails
|
||||
"""
|
||||
console = self.vm.console_socket.makefile()
|
||||
console_logger = logging.getLogger('console')
|
||||
while True:
|
||||
msg = console.readline().strip()
|
||||
if not msg:
|
||||
continue
|
||||
console_logger.debug(msg)
|
||||
if success_message in msg:
|
||||
break
|
||||
if failure_message in msg:
|
||||
fail = 'Failure message found in console: %s' % failure_message
|
||||
self.fail(fail)
|
||||
def wait_for_console_pattern(self, success_message):
|
||||
wait_for_console_pattern(self, success_message,
|
||||
failure_message='Kernel panic - not syncing')
|
||||
|
||||
def exec_command_and_wait_for_pattern(self, command, success_message):
|
||||
command += '\n'
|
||||
self.vm.console_socket.sendall(command.encode())
|
||||
self.wait_for_console_pattern(success_message)
|
||||
wait_for_console_pattern(self, success_message)
|
||||
|
||||
def extract_from_deb(self, deb, path):
|
||||
"""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue