From: Cleber Rosa <crosa@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>
Cc: "Fam Zheng" <fam@euphon.net>,
"Aleksandar Rikalo" <arikalo@wavecomp.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Fabien Chouteau" <chouteau@adacore.com>,
"KONRAD Frederic" <frederic.konrad@adacore.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
qemu-ppc@nongnu.org,
"Aleksandar Rikalo" <aleksandar.rikalo@rt-rk.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 7/16] tests/acceptance: Refactor exec_command_and_wait_for_pattern()
Date: Mon, 28 Oct 2019 19:49:53 -0400 [thread overview]
Message-ID: <20191028235002.17691-8-crosa@redhat.com> (raw)
In-Reply-To: <20191028235002.17691-1-crosa@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Refactor the exec_command_and_wait_for_pattern() utility method
so we can reuse it in other files.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191028073441.6448-6-philmd@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Tested-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/acceptance/avocado_qemu/__init__.py | 19 +++++++++++++++++++
tests/acceptance/boot_linux_console.py | 18 +++++++-----------
2 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 393fc33f35..9a57c020d8 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -80,6 +80,25 @@ def wait_for_console_pattern(test, success_message, failure_message=None):
test.fail(fail)
+def exec_command_and_wait_for_pattern(test, command,
+ success_message, failure_message=None):
+ """
+ Send a command to a console (appending CRLF characters), then wait
+ for success_message to appear on the console, while logging the.
+ content. Mark the test as failed if failure_message is found instead.
+
+ :param test: an Avocado test containing a VM that will have its console
+ read and probed for a success or failure message
+ :type test: :class:`avocado_qemu.Test`
+ :param command: the command to send
+ :param success_message: if this message appears, test succeeds
+ :param failure_message: if this message appears, test fails
+ """
+ command += '\r'
+ test.vm.console_socket.sendall(command.encode())
+ wait_for_console_pattern(test, success_message, failure_message)
+
+
class Test(avocado.Test):
def setUp(self):
self._vms = {}
diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
index f9b77af359..4b419b0559 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -14,6 +14,7 @@ import gzip
import shutil
from avocado_qemu import Test
+from avocado_qemu import exec_command_and_wait_for_pattern
from avocado_qemu import wait_for_console_pattern
from avocado.utils import process
from avocado.utils import archive
@@ -33,11 +34,6 @@ class BootLinuxConsole(Test):
wait_for_console_pattern(self, success_message,
failure_message='Kernel panic - not syncing')
- def exec_command_and_wait_for_pattern(self, command, success_message):
- command += '\r'
- self.vm.console_socket.sendall(command.encode())
- wait_for_console_pattern(self, success_message)
-
def extract_from_deb(self, deb, path):
"""
Extracts a file from a deb package into the test workdir
@@ -166,12 +162,12 @@ class BootLinuxConsole(Test):
self.vm.launch()
self.wait_for_console_pattern('Boot successful.')
- self.exec_command_and_wait_for_pattern('cat /proc/cpuinfo',
- 'BogoMIPS')
- self.exec_command_and_wait_for_pattern('uname -a',
- 'Debian')
- self.exec_command_and_wait_for_pattern('reboot',
- 'reboot: Restarting system')
+ exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo',
+ 'BogoMIPS')
+ exec_command_and_wait_for_pattern(self, 'uname -a',
+ 'Debian')
+ exec_command_and_wait_for_pattern(self, 'reboot',
+ 'reboot: Restarting system')
def do_test_mips_malta32el_nanomips(self, kernel_url, kernel_hash):
kernel_path_xz = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
--
2.21.0
next prev parent reply other threads:[~2019-10-28 23:57 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 23:49 [PULL 0/16] Python (acceptance tests) queue, 2019-10-28 Cleber Rosa
2019-10-28 23:49 ` [PULL 1/16] MAINTAINERS: update location of Python libraries Cleber Rosa
2019-10-28 23:49 ` [PULL 2/16] Acceptance tests: work around socket dir Cleber Rosa
2019-10-28 23:49 ` [PULL 3/16] Python libs: close console sockets before shutting down the VMs Cleber Rosa
2019-10-28 23:49 ` [PULL 4/16] Acceptance tests: refactor wait_for_console_pattern Cleber Rosa
2019-10-28 23:49 ` [PULL 5/16] tests/acceptance: Fix wait_for_console_pattern() hangs Cleber Rosa
2019-10-28 23:49 ` [PULL 6/16] tests/acceptance: Send <carriage return> on serial lines Cleber Rosa
2019-10-28 23:49 ` Cleber Rosa [this message]
2019-10-28 23:49 ` [PULL 8/16] tests/acceptance: Add test that boots the HelenOS microkernel on Leon3 Cleber Rosa
2019-10-28 23:49 ` [PULL 9/16] .travis.yml: Let the avocado job run the Leon3 test Cleber Rosa
2019-10-28 23:49 ` [PULL 10/16] tests/acceptance: Add test that runs NetBSD 4.0 installer on PRep/40p Cleber Rosa
2019-10-28 23:49 ` [PULL 11/16] tests/acceptance: Test OpenBIOS on the PReP/40p Cleber Rosa
2019-10-28 23:49 ` [PULL 12/16] .travis.yml: Let the avocado job run the 40p tests Cleber Rosa
2019-10-28 23:49 ` [PULL 13/16] tests/boot_linux_console: Use Avocado archive::gzip_uncompress() Cleber Rosa
2019-10-28 23:50 ` [PULL 14/16] tests/boot_linux_console: Add a test for the Raspberry Pi 2 Cleber Rosa
2019-10-28 23:50 ` [PULL 15/16] tests/boot_linux_console: Add initrd test for the Exynos4210 Cleber Rosa
2019-10-28 23:50 ` [PULL 16/16] tests/boot_linux_console: Run BusyBox on 5KEc 64-bit cpu Cleber Rosa
2019-10-29 21:13 ` [PULL 0/16] Python (acceptance tests) queue, 2019-10-28 Peter Maydell
2019-10-29 21:51 ` Cleber Rosa
2019-10-29 21:58 ` Cleber Rosa
2019-10-29 23:40 ` Cleber Rosa
2019-10-30 14:10 ` Peter Maydell
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=20191028235002.17691-8-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=aleksandar.rikalo@rt-rk.com \
--cc=alex.bennee@linaro.org \
--cc=arikalo@wavecomp.com \
--cc=aurelien@aurel32.net \
--cc=chouteau@adacore.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=frederic.konrad@adacore.com \
--cc=hpoussin@reactos.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=wainersm@redhat.com \
--cc=wrampazz@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).