[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 06/16] qemu-iotests: delay QMP socket timers
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v5 06/16] qemu-iotests: delay QMP socket timers |
Date: |
Fri, 4 Jun 2021 11:17:13 +0200 |
Attaching gdbserver implies that the qmp socket
should wait indefinitely for an answer from QEMU.
For Timeout class, create a @contextmanager that
switches Timeout with NoTimeout (empty context manager)
so that if --gdb is set, no timeout will be triggered.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/iotests.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index c86f239d81..d4bfd8f1d6 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -486,6 +486,13 @@ def __exit__(self, exc_type, value, traceback):
def timeout(self, signum, frame):
raise Exception(self.errmsg)
+@contextmanager
+def NoTimeout():
+ yield
+
+if qemu_gdb:
+ Timeout = NoTimeout
+
def file_pattern(name):
return "{0}-{1}".format(os.getpid(), name)
@@ -575,7 +582,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,
base_temp_dir=test_dir,
socket_scm_helper=socket_scm_helper,
--
2.30.2
- [PATCH v5 00/16] qemu_iotests: improve debugging options, Emanuele Giuseppe Esposito, 2021/06/04
- [PATCH v5 02/16] python: Reduce strictness of pylint's duplicate-code check, Emanuele Giuseppe Esposito, 2021/06/04
- [PATCH v5 03/16] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine, Emanuele Giuseppe Esposito, 2021/06/04
- [PATCH v5 01/16] python: qemu: add timer parameter for qmp.accept socket, Emanuele Giuseppe Esposito, 2021/06/04
- [PATCH v5 04/16] docs/devel/testing: add debug section to the QEMU iotests chapter, Emanuele Giuseppe Esposito, 2021/06/04
- [PATCH v5 05/16] qemu-iotests: add option to attach gdbserver, Emanuele Giuseppe Esposito, 2021/06/04
- [PATCH v5 06/16] qemu-iotests: delay QMP socket timers,
Emanuele Giuseppe Esposito <=
[PATCH v5 07/16] qemu_iotests: insert gdbserver command line as wrapper for qemu binary, Emanuele Giuseppe Esposito, 2021/06/04
[PATCH v5 08/16] qemu-iotests: add gdbserver option to script tests too, Emanuele Giuseppe Esposito, 2021/06/04
[PATCH v5 10/16] qemu-iotests: extend the check script to prepare supporting valgrind for python tests, Emanuele Giuseppe Esposito, 2021/06/04