Re: [PATCH 1/3] tests/avocado: Make ssh_command_output_contains() globally available

[Cédric Le Goater]

On 4/21/23 13:03, Thomas Huth wrote:
> 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>

Thanks,

C.


> ---
>   tests/avocado/avocado_qemu/__init__.py | 8 ++++++++
>   tests/avocado/linux_ssh_mips_malta.py  | 8 --------
>   2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/tests/avocado/avocado_qemu/__init__.py 
> b/tests/avocado/avocado_qemu/__init__.py
> index cb71f50db9..6788837e1b 100644
> --- a/tests/avocado/avocado_qemu/__init__.py
> +++ b/tests/avocado/avocado_qemu/__init__.py
> @@ -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
>   
> diff --git a/tests/avocado/linux_ssh_mips_malta.py b/tests/avocado/linux_ssh_mips_malta.py
> index 0179d8a6ca..d9bb525ad9 100644
> --- a/tests/avocado/linux_ssh_mips_malta.py
> +++ b/tests/avocado/linux_ssh_mips_malta.py
> @@ -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',