[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 11/16] qemu-iotests: extend QMP socket timeout when using valg
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v7 11/16] qemu-iotests: extend QMP socket timeout when using valgrind |
Date: |
Mon, 28 Jun 2021 14:31:45 +0200 |
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>
---
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
- [PATCH v7 06/16] qemu-iotests: delay QMP socket timers, (continued)
- [PATCH v7 06/16] qemu-iotests: delay QMP socket timers, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 12/16] qemu-iotests: allow valgrind to read/delete the generated log file, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 13/16] qemu-iotests: insert valgrind command line as wrapper for qemu binary, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 10/16] qemu-iotests: extend the check script to prepare supporting valgrind for python tests, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 14/16] docs/devel/testing: add -valgrind option to the debug section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 16/16] docs/devel/testing: add -p option to the debug section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 15/16] qemu-iotests: add option to show qemu binary logs on stdout, Emanuele Giuseppe Esposito, 2021/06/28
- [PATCH v7 11/16] qemu-iotests: extend QMP socket timeout when using valgrind,
Emanuele Giuseppe Esposito <=
- Re: [PATCH v7 00/16] qemu_iotests: improve debugging options, John Snow, 2021/06/28