Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
QEMU VM guest-ping fix
[csit.git]
/
resources
/
libraries
/
python
/
QemuUtils.py
diff --git
a/resources/libraries/python/QemuUtils.py
b/resources/libraries/python/QemuUtils.py
index
6658c07
..
282b157
100644
(file)
--- a/
resources/libraries/python/QemuUtils.py
+++ b/
resources/libraries/python/QemuUtils.py
@@
-214,7
+214,7
@@
class QemuUtils(object):
logger.trace(stdout)
if not stdout:
return {}
logger.trace(stdout)
if not stdout:
return {}
- return json.loads(stdout)
+ return json.loads(stdout
.split('\n', 1)[0]
)
def _wait_until_vm_boot(self, timeout=300):
"""Wait until QEMU VM is booted.
def _wait_until_vm_boot(self, timeout=300):
"""Wait until QEMU VM is booted.
@@
-236,6
+236,9
@@
class QemuUtils(object):
# Non-error return - VM booted
elif out.get('return') is not None:
break
# Non-error return - VM booted
elif out.get('return') is not None:
break
+ # Skip error and wait
+ elif out.get('error') is not None:
+ sleep(5)
else:
raise RuntimeError('QGA guest-ping unexpected output {}'.format(
out))
else:
raise RuntimeError('QGA guest-ping unexpected output {}'.format(
out))