diff options
author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2013-06-28 11:09:28 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-09 10:53:44 +0100 |
commit | 962c0a1fc0694403b385a6f11d710c8675399352 (patch) | |
tree | 239d5a70e1368c802b23c10e19489d32f96097db /meta/lib | |
parent | ac341af8fafc5ea6e3f937ea6ad078ab0812b2bc (diff) | |
download | openembedded-core-contrib-962c0a1fc0694403b385a6f11d710c8675399352.tar.gz |
lib/oeqa/utils/oeqemuconsole.py: handle qemu serial console connection
Python's telnetlib Telnet class connects only to AF_INET sockets, but we
want to use Unix domain socket for the qemu serial connection, so that's
why we override it.
Also we add a new read_all_timeout method similar to Telnet's read_all,
that read until a match or timeout and logs all output.
(From OE-Core rev: 1cfec2f0a1a1ee84cc6b2b6ad890688da85c5e81)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/utils/oeqemuconsole.py | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/oeqemuconsole.py b/meta/lib/oeqa/utils/oeqemuconsole.py new file mode 100644 index 0000000000..95a21332de --- /dev/null +++ b/meta/lib/oeqa/utils/oeqemuconsole.py @@ -0,0 +1,45 @@ +import socket +import time +import re +from telnetlib import Telnet + +class oeQemuConsole(Telnet): + + """ + Override Telnet class to use unix domain sockets, + Telnet uses AF_INET for socket, we don't want that. + Also, provide a read_all variant with timeout, that + returns whatever output there is. + """ + + def __init__(self, stream, logfile): + + Telnet.__init__(self, host=None) + self.stream = stream + self.logfile = logfile + self.eof = 0 + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.sock.connect(stream) + + def log(self, msg): + if self.logfile: + with open(self.logfile, "a") as f: + f.write("%s\n" % msg) + + + def read_all_timeout(self, match, timeout=200): + """Read until EOF or until timeout or until match. + """ + ret = False + self.process_rawq() + endtime = time.time() + timeout + while not self.eof and time.time() < endtime: + self.fill_rawq() + self.process_rawq() + if re.search(match, self.cookedq): + ret = True + break + buf = self.cookedq + self.cookedq = '' + self.log(buf) + return (ret, buf) |