Fixes server hanging infinitely waiting for qemus process to let go of
bitbake.lock
Signed-off-by: Alejandro Hernandez <alejandro.hernan...@linux.intel.com>
---
meta/lib/oeqa/utils/qemurunner.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/utils/qemurunner.py
b/meta/lib/oeqa/utils/qemurunner.py
index 1cf8f76..ff53af3 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -120,14 +120,17 @@ class QemuRunner:
cmdline = ''
with open('/proc/%s/cmdline' % self.qemupid) as p:
cmdline = p.read()
- ips = re.findall("((?:[0-9]{1,3}\.){3}[0-9]{1,3})",
cmdline.split("ip=")[1])
- if not ips or len(ips) != 3:
+ try:
+ ips = re.findall("((?:[0-9]{1,3}\.){3}[0-9]{1,3})",
cmdline.split("ip=")[1])
+ if not ips or len(ips) != 3:
+ raise Exception
+ else:
+ self.ip = ips[0]
+ self.server_ip = ips[1]
+ except Exception:
logger.info("Couldn't get ip from qemu process arguments! Here
is the qemu command line used: %s" % cmdline)
self.stop()
return False
- else:
- self.ip = ips[0]
- self.server_ip = ips[1]
logger.info("Target IP: %s" % self.ip)
logger.info("Server IP: %s" % self.server_ip)
logger.info("Waiting at most %d seconds for login banner" %
self.boottime)
--
1.8.4.5
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
