[oe-commits] [openembedded-core] 39/57: utils: qemurunner.py: Log both 'failed to reach login banner" reasons

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 17b9dba122389ef52f1daefcc75a3ed4a158e91d
Author: Mark Asselstine <mark.asselstine at windriver.com>
AuthorDate: Fri Dec 1 11:30:12 2017 -0500

    utils: qemurunner.py: Log both 'failed to reach login banner" reasons
    
    The current logging always assumes the boot timeout has expired yet
    there is a second reason we might have ended up in a position where no
    login banner was found, that being a socket disconnect. Add logging
    for the disconnect case and make the timeout expiration conditional on
    the timeout being exhausted.
    
    Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/utils/qemurunner.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 8296e98..dfcd63e 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -307,14 +307,18 @@ class QemuRunner:
                                               (time.time() - (endtime - self.boottime),
                                               time.strftime("%D %H:%M:%S")))
                     else:
+                        # no need to check if reachedlogin unless we support multiple connections
+                        self.logger.debug("QEMU socket disconnected before login banner reached. (%s)" %
+                                          time.strftime("%D %H:%M:%S"))
                         socklist.remove(sock)
                         sock.close()
                         stopread = True
 
 
         if not reachedlogin:
-            self.logger.debug("Target didn't reached login boot in %d seconds (%s)" %
-                              (self.boottime, time.strftime("%D %H:%M:%S")))
+            if time.time() >= endtime:
+                self.logger.debug("Target didn't reached login boot in %d seconds (%s)" %
+                                  (self.boottime, time.strftime("%D %H:%M:%S")))
             tail = lambda l: "\n".join(l.splitlines()[-25:])
             # in case bootlog is empty, use tail qemu log store at self.msg
             lines = tail(bootlog if bootlog else self.msg)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.