[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v4 10/15] qemu-iotests: extent QMP socket timeout when using
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
Re: [PATCH v4 10/15] qemu-iotests: extent QMP socket timeout when using valgrind |
Date: |
Fri, 28 May 2021 20:27:05 +0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 |
20.05.2021 10:52, Emanuele Giuseppe Esposito wrote:
As with gdbserver, valgrind delays the test execution, so
the default QMP socket timeout timeout too soon.
First, "Timeout" class is a generic class for timeouts, not relying to sockets.
So, commit message lacks information about that we modify generic context-provider class
and why we do it.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@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 41462a80fc..5d75094ba6 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -489,12 +489,12 @@ def __init__(self, seconds, errmsg="Timeout"):
self.seconds = seconds
self.errmsg = errmsg
def __enter__(self):
- if not qemu_gdb:
+ if not (qemu_gdb or qemu_valgrind):
signal.signal(signal.SIGALRM, self.timeout)
signal.setitimer(signal.ITIMER_REAL, self.seconds)
return self
def __exit__(self, exc_type, value, traceback):
- if not qemu_gdb:
+ if not (qemu_gdb or qemu_valgrind):
If you follow my suggestion on 05, you'll have to modify only one line instead
of two.
signal.setitimer(signal.ITIMER_REAL, 0)
return False
def timeout(self, signum, frame):
@@ -589,7 +589,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,
test_dir=test_dir,
still it should work as intended:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
--
Best regards,
Vladimir
- [PATCH v4 03/15] docs/devel/testing: add debug section to the QEMU iotests chapter, (continued)
- [PATCH v4 03/15] docs/devel/testing: add debug section to the QEMU iotests chapter, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 06/15] qemu_iotests: insert gdbserver command line as wrapper for qemu binary, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 13/15] docs/devel/testing: add -valgrind option to the debug section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 09/15] qemu-iotests: extend the check script to support valgrind for python tests, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 10/15] qemu-iotests: extent QMP socket timeout when using valgrind, Emanuele Giuseppe Esposito, 2021/05/20
- Re: [PATCH v4 10/15] qemu-iotests: extent QMP socket timeout when using valgrind,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 14/15] qemu-iotests: add option to show qemu binary logs on stdout, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 07/15] qemu-iotests: add gdbserver option to script tests too, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 12/15] qemu-iotests: insert valgrind command line as wrapper for qemu binary, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 15/15] docs/devel/testing: add -p option to the debug section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/05/20
- [PATCH v4 11/15] qemu-iotests: allow valgrind to read/delete the generated log file, Emanuele Giuseppe Esposito, 2021/05/20