[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 05/15] qemu-iotests: delay QMP socket timers
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v4 05/15] qemu-iotests: delay QMP socket timers |
Date: |
Thu, 20 May 2021 09:52:26 +0200 |
Attaching gdbserver implies that the qmp socket
should wait indefinitely for an answer from QEMU.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
tests/qemu-iotests/iotests.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index d667fde6f8..cf1ca60376 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -478,11 +478,13 @@ def __init__(self, seconds, errmsg="Timeout"):
self.seconds = seconds
self.errmsg = errmsg
def __enter__(self):
- signal.signal(signal.SIGALRM, self.timeout)
- signal.setitimer(signal.ITIMER_REAL, self.seconds)
+ if not qemu_gdb:
+ signal.signal(signal.SIGALRM, self.timeout)
+ signal.setitimer(signal.ITIMER_REAL, self.seconds)
return self
def __exit__(self, exc_type, value, traceback):
- signal.setitimer(signal.ITIMER_REAL, 0)
+ if not qemu_gdb:
+ signal.setitimer(signal.ITIMER_REAL, 0)
return False
def timeout(self, signum, frame):
raise Exception(self.errmsg)
@@ -576,7 +578,7 @@ class VM(qtest.QEMUQtestMachine):
def __init__(self, path_suffix=''):
name = "qemu%s-%d" % (path_suffix, os.getpid())
- timer = 15.0
+ timer = 15.0 if not qemu_gdb else None
super().__init__(qemu_prog, qemu_opts, name=name,
test_dir=test_dir,
socket_scm_helper=socket_scm_helper,
--
2.30.2
Re: [PATCH v4 04/15] qemu-iotests: add option to attach gdbserver, Vladimir Sementsov-Ogievskiy, 2021/05/28
[PATCH v4 05/15] qemu-iotests: delay QMP socket timers,
Emanuele Giuseppe Esposito <=
[PATCH v4 08/15] docs/devel/testing: add -gdb option to the debugging section of QEMU iotests, Emanuele Giuseppe Esposito, 2021/05/20
[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 10/15] qemu-iotests: extent QMP socket timeout when using valgrind, Emanuele Giuseppe Esposito, 2021/05/20