From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Emanuele Giuseppe Esposito <eesposit@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Cleber Rosa <crosa@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [PATCH v5 06/16] qemu-iotests: delay QMP socket timers
Date: Fri, 4 Jun 2021 11:17:13 +0200 [thread overview]
Message-ID: <20210604091723.13419-7-eesposit@redhat.com> (raw)
In-Reply-To: <20210604091723.13419-1-eesposit@redhat.com>
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
next prev parent reply other threads:[~2021-06-04 9:24 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 9:17 [PATCH v5 00/16] qemu_iotests: improve debugging options Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 01/16] python: qemu: add timer parameter for qmp.accept socket Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 02/16] python: Reduce strictness of pylint's duplicate-code check Emanuele Giuseppe Esposito
2021-06-05 13:30 ` Vladimir Sementsov-Ogievskiy
2021-06-04 9:17 ` [PATCH v5 03/16] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 04/16] docs/devel/testing: add debug section to the QEMU iotests chapter Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 05/16] qemu-iotests: add option to attach gdbserver Emanuele Giuseppe Esposito
2021-06-04 9:17 ` Emanuele Giuseppe Esposito [this message]
2021-06-14 10:36 ` [PATCH v5 06/16] qemu-iotests: delay QMP socket timers Emanuele Giuseppe Esposito
2021-06-15 7:57 ` Vladimir Sementsov-Ogievskiy
2021-06-16 7:09 ` Emanuele Giuseppe Esposito
2021-06-16 9:39 ` Vladimir Sementsov-Ogievskiy
2021-06-04 9:17 ` [PATCH v5 07/16] qemu_iotests: insert gdbserver command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 08/16] qemu-iotests: add gdbserver option to script tests too Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 09/16] docs/devel/testing: add --gdb option to the debugging section of QEMU iotests Emanuele Giuseppe Esposito
2021-06-05 13:22 ` Vladimir Sementsov-Ogievskiy
2021-06-04 9:17 ` [PATCH v5 10/16] qemu-iotests: extend the check script to prepare supporting valgrind for python tests Emanuele Giuseppe Esposito
2021-06-05 13:28 ` Vladimir Sementsov-Ogievskiy
2021-06-05 17:38 ` Emanuele Giuseppe Esposito
2021-06-05 19:19 ` Vladimir Sementsov-Ogievskiy
2021-06-04 9:17 ` [PATCH v5 11/16] qemu-iotests: extend QMP socket timeout when using valgrind Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 12/16] qemu-iotests: allow valgrind to read/delete the generated log file Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 13/16] qemu-iotests: insert valgrind command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 14/16] docs/devel/testing: add --valgrind option to the debug section of QEMU iotests Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 15/16] qemu-iotests: add option to show qemu binary logs on stdout Emanuele Giuseppe Esposito
2021-06-04 9:17 ` [PATCH v5 16/16] docs/devel/testing: add -p option to the debug section of QEMU iotests Emanuele Giuseppe Esposito
2021-06-14 8:48 ` [PATCH v5 00/16] qemu_iotests: improve debugging options Emanuele Giuseppe Esposito
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210604091723.13419-7-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).