OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/avocado: Make ssh_command_output_contains() globally available

Browse Source 
This function will be useful in other tests, too, so move it to the
core LinuxSSHMixIn class.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20230421110345.1294131-2-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230424092249.58552-9-alex.bennee@linaro.org>
This commit is contained in:
Thomas Huth 2023-04-24 10:22:39 +01:00 committed by Alex Bennée
parent df1f50c3c4
commit ca3b0dc3d7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/avocado/avocado_qemu/__init__.py
View File

@ -431,6 +431,14 @@ class LinuxSSHMixIn:
f'Guest command failed: {command}') f'Guest command failed: {command}')
return stdout_lines, stderr_lines return stdout_lines, stderr_lines
def ssh_command_output_contains(self, cmd, exp):
stdout, _ = self.ssh_command(cmd)
for line in stdout:
if exp in line:
break
else:
self.fail('"%s" output does not contain "%s"' % (cmd, exp))
class LinuxDistro: class LinuxDistro:
"""Represents a Linux distribution """Represents a Linux distribution

8
tests/avocado/linux_ssh_mips_malta.py
View File

@ -101,14 +101,6 @@ class LinuxSSH(QemuSystemTest, LinuxSSHMixIn):
self.ssh_disconnect_vm() self.ssh_disconnect_vm()
wait_for_console_pattern(self, 'Power down', 'Oops') wait_for_console_pattern(self, 'Power down', 'Oops')
def ssh_command_output_contains(self, cmd, exp):
stdout, _ = self.ssh_command(cmd)
for line in stdout:
if exp in line:
break
else:
self.fail('"%s" output does not contain "%s"' % (cmd, exp))
def run_common_commands(self, wordsize): def run_common_commands(self, wordsize):
self.ssh_command_output_contains( self.ssh_command_output_contains(
'cat /proc/cpuinfo', 'cat /proc/cpuinfo',