mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-31 11:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Acceptance tests: refactor wait_for_console_pattern

Browse Source 
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:
Cleber Rosa
2019-10-28 19:04:04 -04:00
parent 0858096702
commit 77bcd2487e
3 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/acceptance/linux_ssh_mips_malta.py
View File

@ -13,6 +13,7 @@ import time
from avocado import skipUnless
from avocado_qemu import Test
from avocado_qemu import wait_for_console_pattern
from avocado.utils import process
from avocado.utils import archive
from avocado.utils import ssh
@ -69,19 +70,6 @@ class LinuxSSH(Test):
def setUp(self):
super(LinuxSSH, self).setUp()
def wait_for_console_pattern(self, success_message,
failure_message='Oops'):
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 get_portfwd(self):
res = self.vm.command('human-monitor-command',
command_line='info usernet')
@ -137,7 +125,7 @@ class LinuxSSH(Test):
self.log.info('VM launched, waiting for sshd')
console_pattern = 'Starting OpenBSD Secure Shell server: sshd'
self.wait_for_console_pattern(console_pattern)
wait_for_console_pattern(self, console_pattern, 'Oops')
self.log.info('sshd ready')
self.ssh_connect('root', 'root')
@ -145,7 +133,7 @@ class LinuxSSH(Test):
def shutdown_via_ssh(self):
self.ssh_command('poweroff')
self.ssh_disconnect_vm()
self.wait_for_console_pattern('Power down')
wait_for_console_pattern(self, 'Power down', 'Oops')
def ssh_command_output_contains(self, cmd, exp):
stdout, _ = self.ssh_command(cmd)