| Message ID | 20240805232814.267843-2-npiggin@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/avocado: Fix exec_command and enable ppc_hv_tests.py | expand |
On 06/08/2024 01.28, Nicholas Piggin wrote: > _console_interaction reads data from the console even when there is only > an input string to send, and no output data to wait on. This can cause > lines to be missed by wait_for_console_pattern calls that follows an > exec_command. Fix this by not reading the console if there is no pattern > to wait for. > > This solves occasional hangs in ppc_hv_tests.py, usually when run on KVM > hosts that are fast enough to output important lines quickly enough to be > consumed by exec_command, so they get missed by subsequent wait for > pattern calls. > > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > tests/avocado/avocado_qemu/__init__.py | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py > index a3da2a96bb..ef935614cf 100644 > --- a/tests/avocado/avocado_qemu/__init__.py > +++ b/tests/avocado/avocado_qemu/__init__.py > @@ -135,6 +135,13 @@ def _console_interaction(test, success_message, failure_message, > vm.console_socket.sendall(send_string.encode()) > if not keep_sending: > send_string = None # send only once > + > + # Only consume console output if waiting for something > + if success_message is None and failure_message is None: > + if send_string is None: > + break > + continue > + > try: > msg = console.readline().decode().strip() > except UnicodeDecodeError: Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py index a3da2a96bb..ef935614cf 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -135,6 +135,13 @@ def _console_interaction(test, success_message, failure_message, vm.console_socket.sendall(send_string.encode()) if not keep_sending: send_string = None # send only once + + # Only consume console output if waiting for something + if success_message is None and failure_message is None: + if send_string is None: + break + continue + try: msg = console.readline().decode().strip() except UnicodeDecodeError:
_console_interaction reads data from the console even when there is only an input string to send, and no output data to wait on. This can cause lines to be missed by wait_for_console_pattern calls that follows an exec_command. Fix this by not reading the console if there is no pattern to wait for. This solves occasional hangs in ppc_hv_tests.py, usually when run on KVM hosts that are fast enough to output important lines quickly enough to be consumed by exec_command, so they get missed by subsequent wait for pattern calls. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- tests/avocado/avocado_qemu/__init__.py | 7 +++++++ 1 file changed, 7 insertions(+)