mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/boot_linux_console: refactor the console watcher into utility method

Browse Source 
This introduces a utility method that monitors the console device and
looks for either a message that signals the test success or failure.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Caio Carrara <ccarrara@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20190312171824.5134-12-crosa@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Cleber Rosa 2019-03-12 13:18:15 -04:00 committed by Eduardo Habkost
parent 61f7450662
commit 0d1d74e5e5
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/acceptance/boot_linux_console.py
View File

@ -23,6 +23,25 @@ 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()
console_logger.debug(msg.strip())
if success_message in msg:
break
if failure_message in msg:
fail = 'Failure message found in console: %s' % failure_message
self.fail(fail)
def test_x86_64_pc(self):
"""
:avocado: tags=arch:x86_64
@ -39,12 +58,5 @@ class BootLinuxConsole(Test):
self.vm.add_args('-kernel', kernel_path,
'-append', kernel_command_line)
self.vm.launch()
console = self.vm.console_socket.makefile()
console_logger = logging.getLogger('console')
while True:
msg = console.readline()
console_logger.debug(msg.strip())
if 'Kernel command line: %s' % kernel_command_line in msg:
break
if 'Kernel panic - not syncing' in msg:
self.fail("Kernel panic reached")
console_pattern = 'Kernel command line: %s' % kernel_command_line
self.wait_for_console_pattern(console_pattern)