| Message ID | 31a4b3bb6a48f291890641ab348e7749c70a2d06.1639549843.git.jag.raman@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vfio-user server in QEMU | expand |
On 12/15/21 16:35, Jagannathan Raman wrote: > Specify target VM for exec_command and > exec_command_and_wait_for_pattern routines > > Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com> > Signed-off-by: John G Johnson <john.g.johnson@oracle.com> > Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> > --- > tests/avocado/avocado_qemu/__init__.py | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Wed, Dec 15, 2021 at 10:35:26AM -0500, Jagannathan Raman wrote: > Specify target VM for exec_command and > exec_command_and_wait_for_pattern routines > > Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com> > Signed-off-by: John G Johnson <john.g.johnson@oracle.com> > Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> > --- > tests/avocado/avocado_qemu/__init__.py | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py > index 75063c0c30..26ac782f53 100644 > --- a/tests/avocado/avocado_qemu/__init__.py > +++ b/tests/avocado/avocado_qemu/__init__.py > @@ -198,7 +198,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None, > """ > _console_interaction(test, success_message, failure_message, None, vm=vm) > > -def exec_command(test, command): > +def exec_command(test, command, vm=None): nitpick: if possible, it would be nice to update the docstring, by adding this new argument. > """ > Send a command to a console (appending CRLF characters), while logging > the content. > @@ -208,10 +208,11 @@ def exec_command(test, command): > :param command: the command to send > :type command: str > """ > - _console_interaction(test, None, None, command + '\r') > + _console_interaction(test, None, None, command + '\r', vm=vm) > > def exec_command_and_wait_for_pattern(test, command, > - success_message, failure_message=None): > + success_message, failure_message=None, > + vm=None): Same here. Other than that, lgtm. Reviewed-by: Beraldo Leal <bleal@redhat.com> -- Beraldo
> On Dec 15, 2021, at 5:04 PM, Beraldo Leal <bleal@redhat.com> wrote: > > On Wed, Dec 15, 2021 at 10:35:26AM -0500, Jagannathan Raman wrote: >> Specify target VM for exec_command and >> exec_command_and_wait_for_pattern routines >> >> Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com> >> Signed-off-by: John G Johnson <john.g.johnson@oracle.com> >> Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> >> --- >> tests/avocado/avocado_qemu/__init__.py | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py >> index 75063c0c30..26ac782f53 100644 >> --- a/tests/avocado/avocado_qemu/__init__.py >> +++ b/tests/avocado/avocado_qemu/__init__.py >> @@ -198,7 +198,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None, >> """ >> _console_interaction(test, success_message, failure_message, None, vm=vm) >> >> -def exec_command(test, command): >> +def exec_command(test, command, vm=None): > > nitpick: if possible, it would be nice to update the docstring, by > adding this new argument. > >> """ >> Send a command to a console (appending CRLF characters), while logging >> the content. >> @@ -208,10 +208,11 @@ def exec_command(test, command): >> :param command: the command to send >> :type command: str >> """ >> - _console_interaction(test, None, None, command + '\r') >> + _console_interaction(test, None, None, command + '\r', vm=vm) >> >> def exec_command_and_wait_for_pattern(test, command, >> - success_message, failure_message=None): >> + success_message, failure_message=None, >> + vm=None): > > Same here. OK sure, will do. Thank you! -- Jag > > Other than that, lgtm. > > Reviewed-by: Beraldo Leal <bleal@redhat.com> > > -- > Beraldo >
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py index 75063c0c30..26ac782f53 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -198,7 +198,7 @@ def wait_for_console_pattern(test, success_message, failure_message=None, """ _console_interaction(test, success_message, failure_message, None, vm=vm) -def exec_command(test, command): +def exec_command(test, command, vm=None): """ Send a command to a console (appending CRLF characters), while logging the content. @@ -208,10 +208,11 @@ def exec_command(test, command): :param command: the command to send :type command: str """ - _console_interaction(test, None, None, command + '\r') + _console_interaction(test, None, None, command + '\r', vm=vm) def exec_command_and_wait_for_pattern(test, command, - success_message, failure_message=None): + success_message, failure_message=None, + vm=None): """ Send a command to a console (appending CRLF characters), then wait for success_message to appear on the console, while logging the. @@ -224,7 +225,8 @@ def exec_command_and_wait_for_pattern(test, command, :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, command + '\r') + _console_interaction(test, success_message, failure_message, command + '\r', + vm=vm) class QemuBaseTest(avocado.Test): def _get_unique_tag_val(self, tag_name):