diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-04-24 10:22:39 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2023-04-27 14:58:23 +0100 |
| commit | ca3b0dc3d7450fb5b2eaff4de584ef3eb10466ff (patch) | |
| tree | 863a059541ef3485e84a5ccb247072f2f66d3ec9 | |
| parent | df1f50c3c427a6143826fc420aa62bfa0b83b1ba (diff) | |
| download | focaccia-qemu-ca3b0dc3d7450fb5b2eaff4de584ef3eb10466ff.tar.gz focaccia-qemu-ca3b0dc3d7450fb5b2eaff4de584ef3eb10466ff.zip | |
tests/avocado: Make ssh_command_output_contains() globally available
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>
| -rw-r--r-- | tests/avocado/avocado_qemu/__init__.py | 8 | ||||
| -rw-r--r-- | 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 @@ class LinuxSSHMixIn: 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 @@ class LinuxSSH(QemuSystemTest, LinuxSSHMixIn): 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', |