From: Willian Rampazzo <wrampazz@redhat.com>
To: Pavel Dovgalyuk <Pavel.Dovgaluk@gmail.com>
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel <qemu-devel@nongnu.org>,
dovgaluk@ispras.ru, pavel.dovgaluk@ispras.ru,
"Cleber Rosa Junior" <crosa@redhat.com>,
pbonzini@redhat.com, "Philippe Mathieu Daude" <philmd@redhat.com>
Subject: Re: [PATCH 1/9] tests/acceptance: allow console interaction with specific VMs
Date: Tue, 26 May 2020 17:48:57 -0300 [thread overview]
Message-ID: <CAKJDGDY6N+SU3n2w3v8xnn5_245mviBWj3D1fgd0tW33h2a+hQ@mail.gmail.com> (raw)
In-Reply-To: <159040554841.2615.9176706179382687894.stgit@pasha-ThinkPad-X280>
On Mon, May 25, 2020 at 8:20 AM Pavel Dovgalyuk
<Pavel.Dovgaluk@gmail.com> wrote:
>
> Console interaction in avocado scripts was possible only with single
> default VM.
> This patch modifies the function parameters to allow passing a specific
> VM as a parameter to interact with it.
>
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
> ---
> tests/acceptance/avocado_qemu/__init__.py | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
> index 59e7b4f763..0bbaa8d2a6 100644
> --- a/tests/acceptance/avocado_qemu/__init__.py
> +++ b/tests/acceptance/avocado_qemu/__init__.py
> @@ -69,13 +69,15 @@ def pick_default_qemu_bin(arch=None):
>
>
> def _console_interaction(test, success_message, failure_message,
> - send_string, keep_sending=False):
> + send_string, keep_sending=False, vm=None):
> assert not keep_sending or send_string
> - console = test.vm.console_socket.makefile()
> + if vm is None:
> + vm = test.vm
> + console = vm.console_socket.makefile()
> console_logger = logging.getLogger('console')
> while True:
> if send_string:
> - test.vm.console_socket.sendall(send_string.encode())
> + vm.console_socket.sendall(send_string.encode())
> if not keep_sending:
> send_string = None # send only once
> msg = console.readline().strip()
> @@ -115,7 +117,7 @@ def interrupt_interactive_console_until_pattern(test, success_message,
> _console_interaction(test, success_message, failure_message,
> interrupt_string, True)
>
> -def wait_for_console_pattern(test, success_message, failure_message=None):
> +def wait_for_console_pattern(test, success_message, failure_message=None, vm=None):
> """
> Waits for messages to appear on the console, while logging the content
>
> @@ -125,7 +127,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None):
> :param success_message: if this message appears, test succeeds
> :param failure_message: if this message appears, test fails
> """
> - _console_interaction(test, success_message, failure_message, None)
> + _console_interaction(test, success_message, failure_message, None, vm=vm)
>
> def exec_command_and_wait_for_pattern(test, command,
> success_message, failure_message=None):
>
>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
next prev parent reply other threads:[~2020-05-26 20:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 11:19 [PATCH 0/9] Record/replay acceptance tests Pavel Dovgalyuk
2020-05-25 11:19 ` [PATCH 1/9] tests/acceptance: allow console interaction with specific VMs Pavel Dovgalyuk
2020-05-26 20:48 ` Willian Rampazzo [this message]
2020-05-25 11:19 ` [PATCH 2/9] tests/acceptance: add base class record/replay kernel tests Pavel Dovgalyuk
2020-05-26 20:46 ` Willian Rampazzo
2020-05-25 11:19 ` [PATCH 3/9] tests/acceptance: add kernel record/replay test for x86_64 Pavel Dovgalyuk
2020-05-25 11:19 ` [PATCH 4/9] tests/acceptance: add record/replay test for aarch64 Pavel Dovgalyuk
2020-05-25 11:19 ` [PATCH 5/9] tests/acceptance: add record/replay test for arm Pavel Dovgalyuk
2020-05-25 11:19 ` [PATCH 6/9] tests/acceptance: add record/replay test for ppc64 Pavel Dovgalyuk
2020-05-25 11:19 ` [PATCH 7/9] tests/acceptance: add record/replay test for m68k Pavel Dovgalyuk
2020-05-25 11:19 ` [PATCH 8/9] tests/acceptance: record/replay tests with advcal images Pavel Dovgalyuk
2020-05-26 19:22 ` Willian Rampazzo
2020-05-25 11:19 ` [PATCH 9/9] tests/acceptance: Linux boot test for record/replay Pavel Dovgalyuk
2020-05-26 19:06 ` Willian Rampazzo
2020-05-26 19:52 ` Willian Rampazzo
2020-05-25 17:03 ` [PATCH 0/9] Record/replay acceptance tests no-reply
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=CAKJDGDY6N+SU3n2w3v8xnn5_245mviBWj3D1fgd0tW33h2a+hQ@mail.gmail.com \
--to=wrampazz@redhat.com \
--cc=Pavel.Dovgaluk@gmail.com \
--cc=alex.bennee@linaro.org \
--cc=crosa@redhat.com \
--cc=dovgaluk@ispras.ru \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).