]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
tests/acceptance: Fix wait_for_console_pattern() hangs
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Mon, 28 Oct 2019 23:04:04 +0000 (19:04 -0400)
committerCleber Rosa <crosa@redhat.com>
Mon, 28 Oct 2019 23:04:04 +0000 (19:04 -0400)
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>
tests/acceptance/avocado_qemu/__init__.py

index 772771e205aacccec1e04838961eade98cc51968..393fc33f35ff46ffeb9b016c5916821bdfefe6d9 100644 (file)
@@ -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)