aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2019-10-28 19:04:04 -0400
committerCleber Rosa <crosa@redhat.com>2019-10-28 19:04:04 -0400
commitffc1fe7894f7704ed6af0746715099b098a61463 (patch)
tree7d7c0a1e412d76f5b638716f7114335a68808439
parent77bcd2487e527334a65ca5f263ccfe62f57a7bd5 (diff)
downloadqemu-ffc1fe7894f7704ed6af0746715099b098a61463.zip
qemu-ffc1fe7894f7704ed6af0746715099b098a61463.tar.gz
qemu-ffc1fe7894f7704ed6af0746715099b098a61463.tar.bz2
tests/acceptance: Fix wait_for_console_pattern() hangs
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> Message-Id: <20191028073441.6448-4-philmd@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> [Cleber: corrected small typo in commit message] Signed-off-by: Cleber Rosa <crosa@redhat.com>
-rw-r--r--tests/acceptance/avocado_qemu/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py
index 772771e..393fc33 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)