[03/26] tests/acceptance: Fixe wait_for_console_pattern() hangs
diff mbox series

Message ID 20191028073441.6448-4-philmd@redhat.com
State New
Headers show
Series
  • tests/acceptance: Queue for 4.2
Related show

Commit Message

Philippe Mathieu-Daudé Oct. 28, 2019, 7:34 a.m. UTC
Because of a possible deadlock (QEMU waiting for the socket to
become writable) let's close the console socket as soon as we
stop to use it.

Suggested-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/avocado_qemu/__init__.py | 1 +
 1 file changed, 1 insertion(+)

Comments

Aleksandar Markovic Oct. 28, 2019, 8:01 a.m. UTC | #1
On Monday, October 28, 2019, Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:

> Because of a possible deadlock (QEMU waiting for the socket to
> become writable) let's close the console socket as soon as we
> stop to use it.
>
> Suggested-by: Cleber Rosa <crosa@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/acceptance/avocado_qemu/__init__.py | 1 +
>  1 file changed, 1 insertion(+)
>
>
Fixe -> Fix

You missed my r-b again, given in:

https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg06376.html

A.



> diff --git a/tests/acceptance/avocado_qemu/__init__.py
> b/tests/acceptance/avocado_qemu/__init__.py
> index e3101cba30..a0450e5263 100644
> --- a/tests/acceptance/avocado_qemu/__init__.py
> +++ b/tests/acceptance/avocado_qemu/__init__.py
> @@ -74,6 +74,7 @@ def wait_for_console_pattern(test, success_message,
> failure_message=None):
>          if success_message in msg:
>              break
>          if failure_message and failure_message in msg:
> +            console.close()
>              fail = 'Failure message found in console: %s' %
> failure_message
>              test.fail(fail)
>
> --
> 2.21.0
>
>
>
Cleber Rosa Oct. 28, 2019, 3:24 p.m. UTC | #2
On Mon, Oct 28, 2019 at 08:34:18AM +0100, Philippe Mathieu-Daudé wrote:
> Because of a possible deadlock (QEMU waiting for the socket to
> become writable) let's close the console socket as soon as we
> stop to use it.
> 
> Suggested-by: Cleber Rosa <crosa@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Cleber Rosa <crosa@redhat.com>

Queuing on my python-next branch (and sending shortly in a PR).

Thanks,
- Cleber.
Cleber Rosa Oct. 28, 2019, 3:28 p.m. UTC | #3
On Mon, Oct 28, 2019 at 09:01:16AM +0100, Aleksandar Markovic wrote:
> On Monday, October 28, 2019, Philippe Mathieu-Daudé <philmd@redhat.com>
> wrote:
> 
> > Because of a possible deadlock (QEMU waiting for the socket to
> > become writable) let's close the console socket as soon as we
> > stop to use it.
> >
> > Suggested-by: Cleber Rosa <crosa@redhat.com>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---
> >  tests/acceptance/avocado_qemu/__init__.py | 1 +
> >  1 file changed, 1 insertion(+)
> >
> >
> Fixe -> Fix
> 
> You missed my r-b again, given in:
> 
> https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg06376.html
> 
> A.
> 

I've collected your review and I'm queuing on my python-next branch
(and sending shortly in a PR).

Thanks,
- Cleber.

Patch
diff mbox series

diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index e3101cba30..a0450e5263 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -74,6 +74,7 @@  def wait_for_console_pattern(test, success_message, failure_message=None):
         if success_message in msg:
             break
         if failure_message and failure_message in msg:
+            console.close()
             fail = 'Failure message found in console: %s' % failure_message
             test.fail(fail)