Skip to content

Commit

Permalink
tests/avocado: Make ssh_command_output_contains() globally available
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
huth authored and stsquad committed Apr 27, 2023
1 parent df1f50c commit ca3b0dc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 8 additions & 0 deletions tests/avocado/avocado_qemu/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,14 @@ def ssh_command(self, command):
f'Guest command failed: {command}')
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:
"""Represents a Linux distribution
Expand Down
8 changes: 0 additions & 8 deletions tests/avocado/linux_ssh_mips_malta.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,6 @@ def shutdown_via_ssh(self):
self.ssh_disconnect_vm()
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):
self.ssh_command_output_contains(
'cat /proc/cpuinfo',
Expand Down

0 comments on commit ca3b0dc

Please sign in to comment.