From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org, "Thomas Huth" <thuth@redhat.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Cleber Rosa" <crosa@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Beraldo Leal" <bleal@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 08/18] tests/avocado: Make ssh_command_output_contains() globally available
Date: Thu, 27 Apr 2023 16:45:00 +0100 [thread overview]
Message-ID: <20230427154510.1791273-9-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230427154510.1791273-1-alex.bennee@linaro.org>
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>
Message-Id: <20230424092249.58552-9-alex.bennee@linaro.org>
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
next prev parent reply other threads:[~2023-04-27 15:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-27 15:44 [PULL 00/18] testing and doc updates Alex Bennée
2023-04-27 15:44 ` [PULL 01/18] tests/requirements.txt: bump up avocado-framework version to 101.0 Alex Bennée
2023-04-27 15:44 ` [PULL 02/18] tests/avocado: use the new snapshots for testing Alex Bennée
2023-04-28 12:08 ` Thomas Huth
2023-04-28 16:43 ` Alex Bennée
2023-04-27 15:44 ` [PULL 03/18] tests/avocado: Add set of boot tests on SBSA-ref Alex Bennée
2023-04-28 10:33 ` Thomas Huth
2023-07-10 12:10 ` Thomas Huth
2023-04-27 15:44 ` [PULL 04/18] gitlab-ci: Avoid to re-run "configure" in the device-crash-test jobs Alex Bennée
2023-04-27 15:44 ` [PULL 05/18] scripts/device-crash-test: Add a parameter to run with TCG only Alex Bennée
2023-04-27 15:44 ` [PULL 06/18] qemu-options: finesse the recommendations around -blockdev Alex Bennée
2023-04-27 15:44 ` [PULL 07/18] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12 Alex Bennée
2023-04-27 15:45 ` Alex Bennée [this message]
2023-04-27 15:45 ` [PULL 09/18] tests/avocado/machine_aspeed: Fix the broken ast2[56]00_evb_sdk tests Alex Bennée
2023-04-27 15:45 ` [PULL 10/18] MAINTAINERS: Cover tests/avocado/machine_aspeed.py Alex Bennée
2023-04-27 15:45 ` [PULL 11/18] avocado_qemu/__init__.py: factor out the qemu-img finding Alex Bennée
2023-04-27 15:45 ` [PULL 12/18] tests/avocado/tuxrun_baselines.py: improve code coverage for ppc64 Alex Bennée
2023-04-27 15:45 ` [PULL 13/18] tests/tcg: limit the scope of the plugin tests Alex Bennée
2023-04-27 15:45 ` [PULL 14/18] qemu-options.hx: Update descriptions of memory options for NUMA node Alex Bennée
2023-04-27 15:45 ` [PULL 15/18] docs/system: remove excessive punctuation from guest-loader docs Alex Bennée
2023-04-27 15:45 ` [PULL 16/18] docs/devel: make a statement about includes Alex Bennée
2023-04-27 15:45 ` [PULL 17/18] docs/devel: mention the spacing requirement for QOM Alex Bennée
2023-04-27 15:45 ` [PULL 18/18] docs/style: call out the use of GUARD macros Alex Bennée
2023-04-28 7:34 ` [PULL 00/18] testing and doc updates Richard Henderson
2023-05-02 11:46 ` Peter Maydell
2023-05-02 12:21 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230427154510.1791273-9-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=crosa@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).