summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 16:51:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-29 23:36:16 +0100
commitb87a33d9c86cc1d2ea196259020e1d3dc712ccef (patch)
tree57093cde7d7fab8141b76283aa39c496a89a20b1
parent7e667078cdfe2fa11d9b819be1598279422df275 (diff)
downloadopenembedded-core-contrib-b87a33d9c86cc1d2ea196259020e1d3dc712ccef.tar.gz
openembedded-core-contrib-b87a33d9c86cc1d2ea196259020e1d3dc712ccef.tar.bz2
openembedded-core-contrib-b87a33d9c86cc1d2ea196259020e1d3dc712ccef.zip
qemurunner: Tweak qemu pid starting timeout code
We're seeing timeouts in the autobuilder testing code. Increase these timeouts to 120, print the length of time we're having to wait, change the error messages to really be errors and don't print empty logs, its not helpful, print a message about the empty log instead. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index cd60ba71a3..54312fb94c 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -55,7 +55,7 @@ class QemuRunner:
self.thread = None
self.use_kvm = use_kvm
- self.runqemutime = 60
+ self.runqemutime = 120
self.host_dumper = HostDumper(dump_host_cmds, dump_dir)
def create_socket(self):
@@ -204,7 +204,7 @@ class QemuRunner:
out = self.getOutput(output)
netconf = False # network configuration is not required by default
if self.is_alive():
- logger.info("qemu started - qemu procces pid is %s" % self.qemupid)
+ logger.info("qemu started in %s seconds - qemu procces pid is %s" % (time.time() - (endtime - self.runqemutime), self.qemupid))
if get_ip:
cmdline = ''
with open('/proc/%s/cmdline' % self.qemupid) as p:
@@ -317,10 +317,14 @@ class QemuRunner:
logger.info("Serial console failed while trying to login")
else:
- logger.info("Qemu pid didn't appeared in %s seconds" % self.runqemutime)
+ logger.error("Qemu pid didn't appear in %s seconds" % self.runqemutime)
self._dump_host()
self.stop()
- logger.info("Output from runqemu:\n%s" % self.getOutput(output))
+ op = self.getOutput(output)
+ if op:
+ logger.error("Output from runqemu:\n%s" % op)
+ else:
+ logger.error("No output from runqemu.\n")
return False
return self.is_alive()