[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/3] scripts/qmp: Accept timeout parameter on accept
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 1/3] scripts/qmp: Accept timeout parameter on accept() |
Date: |
Tue, 13 Jun 2017 20:06:25 -0300 |
Shorter timeouts will be useful for test code that needs to catch QEMU
exiting before it connects to the QMP socket.
Signed-off-by: Eduardo Habkost <address@hidden>
---
scripts/qmp/qmp.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index 62d3651967..1b27064d91 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -132,7 +132,7 @@ class QEMUMonitorProtocol:
if negotiate:
return self.__negotiate_capabilities()
- def accept(self):
+ def accept(self, timeout=15):
"""
Await connection from QMP Monitor and perform capabilities negotiation.
@@ -141,7 +141,7 @@ class QEMUMonitorProtocol:
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
"""
- self.__sock.settimeout(15)
+ self.__sock.settimeout(timeout)
self.__sock, _ = self.__sock.accept()
self.__sockfile = self.__sock.makefile()
return self.__negotiate_capabilities()
--
2.11.0.259.g40922b1