[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/16] tests/acceptance: Fix wait_for_console_pattern() hangs
From: |
Cleber Rosa |
Subject: |
[PULL 5/16] tests/acceptance: Fix wait_for_console_pattern() hangs |
Date: |
Mon, 28 Oct 2019 19:49:51 -0400 |
From: Philippe Mathieu-Daudé <address@hidden>
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 <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
[Cleber: corrected small typo in commit message]
Signed-off-by: Cleber Rosa <address@hidden>
---
tests/acceptance/avocado_qemu/__init__.py | 1 +
1 file changed, 1 insertion(+)
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)
--
2.21.0
- [PULL 0/16] Python (acceptance tests) queue, 2019-10-28, Cleber Rosa, 2019/10/28
- [PULL 13/16] tests/boot_linux_console: Use Avocado archive::gzip_uncompress(), Cleber Rosa, 2019/10/28
- [PULL 14/16] tests/boot_linux_console: Add a test for the Raspberry Pi 2, Cleber Rosa, 2019/10/28
- [PULL 12/16] .travis.yml: Let the avocado job run the 40p tests, Cleber Rosa, 2019/10/28
- [PULL 11/16] tests/acceptance: Test OpenBIOS on the PReP/40p, Cleber Rosa, 2019/10/28
- [PULL 10/16] tests/acceptance: Add test that runs NetBSD 4.0 installer on PRep/40p, Cleber Rosa, 2019/10/28
- [PULL 9/16] .travis.yml: Let the avocado job run the Leon3 test, Cleber Rosa, 2019/10/28
- [PULL 7/16] tests/acceptance: Refactor exec_command_and_wait_for_pattern(), Cleber Rosa, 2019/10/28
- [PULL 5/16] tests/acceptance: Fix wait_for_console_pattern() hangs,
Cleber Rosa <=
- [PULL 8/16] tests/acceptance: Add test that boots the HelenOS microkernel on Leon3, Cleber Rosa, 2019/10/28
- [PULL 6/16] tests/acceptance: Send <carriage return> on serial lines, Cleber Rosa, 2019/10/28
- [PULL 15/16] tests/boot_linux_console: Add initrd test for the Exynos4210, Cleber Rosa, 2019/10/28
- [PULL 16/16] tests/boot_linux_console: Run BusyBox on 5KEc 64-bit cpu, Cleber Rosa, 2019/10/28
- [PULL 4/16] Acceptance tests: refactor wait_for_console_pattern, Cleber Rosa, 2019/10/28
- [PULL 3/16] Python libs: close console sockets before shutting down the VMs, Cleber Rosa, 2019/10/28
- [PULL 2/16] Acceptance tests: work around socket dir, Cleber Rosa, 2019/10/28
- [PULL 1/16] MAINTAINERS: update location of Python libraries, Cleber Rosa, 2019/10/28
- Re: [PULL 0/16] Python (acceptance tests) queue, 2019-10-28, Peter Maydell, 2019/10/29