Skip to content

Commit

Permalink
scripts: set timeout when waiting for qemu monitor connection
Browse files Browse the repository at this point in the history
If QEMU fails to launch for some reason, the QEMUMonitorProtocol
class accept() method will wait forever in a socket accept call.
Set a timeout of 15 seconds so that we fail more gracefully
instead of hanging the test script forever

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1469020993-29426-5-git-send-email-berrange@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
  • Loading branch information
berrange authored and Amit Shah committed Jul 22, 2016
1 parent 6661397 commit 2380646
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions scripts/qmp/qmp.py
Expand Up @@ -140,6 +140,7 @@ def accept(self):
@raise QMPConnectError if the greeting is not received
@raise QMPCapabilitiesError if fails to negotiate capabilities
"""
self.__sock.settimeout(15)
self.__sock, _ = self.__sock.accept()
self.__sockfile = self.__sock.makefile()
return self.__negotiate_capabilities()
Expand Down

0 comments on commit 2380646

Please sign in to comment.