[PULL,5/16] tests/acceptance: Fix wait_for_console_pattern() hangs

Commit Message

Cleber Rosa Oct. 28, 2019, 11:49 p.m. UTC

From: Philippe Mathieu-Daudé <[e-mail]>

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 <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Cleber Rosa <[e-mail]>
Reviewed-by: Aleksandar Markovic <[e-mail]>
[Cleber: corrected small typo in commit message]
Signed-off-by: Cleber Rosa <[e-mail]>
---
 tests/acceptance/avocado_qemu/__init__.py | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 772771e205..393fc33f35 100644
--- a/tests/acceptance/avocado_qemu/__init__.py
+++ b/tests/acceptance/avocado_qemu/__init__.py
@@ -75,6 +75,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)