[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/18] tests/avocado: Make ssh_command_output_contains() globally
From: |
Alex Bennée |
Subject: |
[PATCH 08/18] tests/avocado: Make ssh_command_output_contains() globally available |
Date: |
Mon, 24 Apr 2023 10:22:39 +0100 |
From: Thomas Huth <thuth@redhat.com>
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>
---
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',
--
2.39.2
- [PATCH 00/18] testing/next: avocado, docs (pre-PR), Alex Bennée, 2023/04/24
- [PATCH 01/18] tests/requirements.txt: bump up avocado-framework version to 101.0, Alex Bennée, 2023/04/24
- [PATCH 04/18] gitlab-ci: Avoid to re-run "configure" in the device-crash-test jobs, Alex Bennée, 2023/04/24
- [PATCH 08/18] tests/avocado: Make ssh_command_output_contains() globally available,
Alex Bennée <=
- [PATCH 05/18] scripts/device-crash-test: Add a parameter to run with TCG only, Alex Bennée, 2023/04/24
- [PATCH 03/18] tests/avocado: Add set of boot tests on SBSA-ref, Alex Bennée, 2023/04/24
- [PATCH 02/18] tests/avocado: use the new snapshots for testing, Alex Bennée, 2023/04/24
- [PATCH 07/18] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12, Alex Bennée, 2023/04/24
- [PATCH 06/18] qemu-options: finesse the recommendations around -blockdev, Alex Bennée, 2023/04/24
- [PATCH 15/18] docs/system: remove excessive punctuation from guest-loader docs, Alex Bennée, 2023/04/24
- [PATCH 12/18] tests/avocado/tuxrun_baselines.py: improve code coverage for ppc64, Alex Bennée, 2023/04/24
- [PATCH 09/18] tests/avocado/machine_aspeed: Fix the broken ast2[56]00_evb_sdk tests, Alex Bennée, 2023/04/24
- [PATCH 14/18] qemu-options.hx: Update descriptions of memory options for NUMA node, Alex Bennée, 2023/04/24