[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/56] qemu-iotests: extend QMP socket timeout when using valgrind
From: |
Hanna Reitz |
Subject: |
[PULL 11/56] qemu-iotests: extend QMP socket timeout when using valgrind |
Date: |
Wed, 1 Sep 2021 17:15:34 +0200 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
As with gdbserver, valgrind delays the test execution, so
the default QMP socket timeout and the generic class
Timeout in iotests.py timeouts too soon.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210809090114.64834-12-eesposit@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 6aa1dc48ba..26c580f9e7 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -488,13 +488,13 @@ def __init__(self, seconds, errmsg="Timeout"):
self.seconds = seconds
self.errmsg = errmsg
def __enter__(self):
- if qemu_gdb:
+ if qemu_gdb or qemu_valgrind:
return self
signal.signal(signal.SIGALRM, self.timeout)
signal.setitimer(signal.ITIMER_REAL, self.seconds)
return self
def __exit__(self, exc_type, value, traceback):
- if qemu_gdb:
+ if qemu_gdb or qemu_valgrind:
return False
signal.setitimer(signal.ITIMER_REAL, 0)
return False
@@ -590,7 +590,7 @@ class VM(qtest.QEMUQtestMachine):
def __init__(self, path_suffix=''):
name = "qemu%s-%d" % (path_suffix, os.getpid())
- timer = 15.0 if not qemu_gdb else None
+ timer = 15.0 if not (qemu_gdb or qemu_valgrind) else None
super().__init__(qemu_prog, qemu_opts, wrapper=qemu_gdb,
name=name,
base_temp_dir=test_dir,
--
2.31.1
- [PULL 01/56] python: qemu: add timer parameter for qmp.accept socket, (continued)
- [PULL 01/56] python: qemu: add timer parameter for qmp.accept socket, Hanna Reitz, 2021/09/01
- [PULL 02/56] python: Reduce strictness of pylint's duplicate-code check, Hanna Reitz, 2021/09/01
- [PULL 03/56] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine, Hanna Reitz, 2021/09/01
- [PULL 04/56] docs/devel/testing: add debug section to the QEMU iotests chapter, Hanna Reitz, 2021/09/01
- [PULL 06/56] qemu-iotests: delay QMP socket timers, Hanna Reitz, 2021/09/01
- [PULL 05/56] qemu-iotests: add option to attach gdbserver, Hanna Reitz, 2021/09/01
- [PULL 08/56] qemu-iotests: add gdbserver option to script tests too, Hanna Reitz, 2021/09/01
- [PULL 07/56] qemu_iotests: insert gdbserver command line as wrapper for qemu binary, Hanna Reitz, 2021/09/01
- [PULL 10/56] qemu-iotests: extend the check script to prepare supporting valgrind for python tests, Hanna Reitz, 2021/09/01
- [PULL 09/56] docs/devel/testing: add -gdb option to the debugging section of QEMU iotests, Hanna Reitz, 2021/09/01
- [PULL 11/56] qemu-iotests: extend QMP socket timeout when using valgrind,
Hanna Reitz <=
- [PULL 12/56] qemu-iotests: allow valgrind to read/delete the generated log file, Hanna Reitz, 2021/09/01
- [PULL 13/56] qemu-iotests: insert valgrind command line as wrapper for qemu binary, Hanna Reitz, 2021/09/01
- [PULL 14/56] docs/devel/testing: add -valgrind option to the debug section of QEMU iotests, Hanna Reitz, 2021/09/01
- [PULL 15/56] qemu-iotests: add option to show qemu binary logs on stdout, Hanna Reitz, 2021/09/01
- [PULL 16/56] docs/devel/testing: add -p option to the debug section of QEMU iotests, Hanna Reitz, 2021/09/01
- [PULL 17/56] block/monitor: Consolidate hmp_handle_error calls to reduce redundant code, Hanna Reitz, 2021/09/01
- [PULL 18/56] raw-format: drop WRITE and RESIZE child perms when possible, Hanna Reitz, 2021/09/01
- [PULL 19/56] iotests: use with-statement for open() calls, Hanna Reitz, 2021/09/01
- [PULL 20/56] iotests: use subprocess.DEVNULL instead of open("/dev/null"), Hanna Reitz, 2021/09/01
- [PULL 21/56] block: introduce bdrv_replace_child_bs(), Hanna Reitz, 2021/09/01