diff options
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 8296e989b1..dfcd63eab4 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
| @@ -307,14 +307,18 @@ class QemuRunner: | |||
| 307 | (time.time() - (endtime - self.boottime), | 307 | (time.time() - (endtime - self.boottime), |
| 308 | time.strftime("%D %H:%M:%S"))) | 308 | time.strftime("%D %H:%M:%S"))) |
| 309 | else: | 309 | else: |
| 310 | # no need to check if reachedlogin unless we support multiple connections | ||
| 311 | self.logger.debug("QEMU socket disconnected before login banner reached. (%s)" % | ||
| 312 | time.strftime("%D %H:%M:%S")) | ||
| 310 | socklist.remove(sock) | 313 | socklist.remove(sock) |
| 311 | sock.close() | 314 | sock.close() |
| 312 | stopread = True | 315 | stopread = True |
| 313 | 316 | ||
| 314 | 317 | ||
| 315 | if not reachedlogin: | 318 | if not reachedlogin: |
| 316 | self.logger.debug("Target didn't reached login boot in %d seconds (%s)" % | 319 | if time.time() >= endtime: |
| 317 | (self.boottime, time.strftime("%D %H:%M:%S"))) | 320 | self.logger.debug("Target didn't reached login boot in %d seconds (%s)" % |
| 321 | (self.boottime, time.strftime("%D %H:%M:%S"))) | ||
| 318 | tail = lambda l: "\n".join(l.splitlines()[-25:]) | 322 | tail = lambda l: "\n".join(l.splitlines()[-25:]) |
| 319 | # in case bootlog is empty, use tail qemu log store at self.msg | 323 | # in case bootlog is empty, use tail qemu log store at self.msg |
| 320 | lines = tail(bootlog if bootlog else self.msg) | 324 | lines = tail(bootlog if bootlog else self.msg) |