]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/utils/qemurunner: search for login string in the entire boot log
authorStefan Stanacar <stefanx.stanacar@intel.com>
Fri, 7 Mar 2014 14:20:07 +0000 (14:20 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 11 Mar 2014 15:08:12 +0000 (08:08 -0700)
If some service is to spammy we might miss the login, so search
in the entire log instead of just the last few lines.
Use qemu in regex too (to avoid a login string from some service).

Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/utils/qemurunner.py

index 337b5874b28ba172c7139f476a3a2d9b29697f59..f1a7e24ab7665139a8febef8986e65cf6244d170 100644 (file)
@@ -133,8 +133,7 @@ class QemuRunner:
                         if data:
                             self.log(data)
                             self.bootlog += data
-                            lastlines = "\n".join(self.bootlog.splitlines()[-2:])
-                            if re.search("login:", lastlines):
+                            if re.search("qemu.* login:", self.bootlog):
                                 stopread = True
                                 reachedlogin = True
                                 bb.note("Reached login banner")