NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support/testing: use pexpect.sendline directly

Browse Source 
When using pexpect there is no need for a helper function. Just use
sendline() directly everywhere.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Ricardo Martincoski 2017-06-28 23:45:44 -03:00 committed by Thomas Petazzoni
parent e664c5f71c
commit 77b4b948fc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
support/testing/infra/emulator.py
View File

@ -80,9 +80,6 @@ class Emulator(object):
# works as expected. # works as expected.
return data.replace("\r\r", "\r") return data.replace("\r\r", "\r")
def __write(self, wstr):
self.qemu.send(wstr)
# Wait for the login prompt to appear, and then login as root with # Wait for the login prompt to appear, and then login as root with
# the provided password, or no password if not specified. # the provided password, or no password if not specified.
def login(self, password=None): def login(self, password=None):
@ -91,10 +88,10 @@ class Emulator(object):
self.logfile.write("==> System does not boot") self.logfile.write("==> System does not boot")
raise SystemError("System does not boot") raise SystemError("System does not boot")
self.__write("root\n") self.qemu.sendline("root")
if password: if password:
self.__read_until("Password:") self.__read_until("Password:")
self.__write(password + "\n") self.qemu.sendline(password)
self.__read_until("# ") self.__read_until("# ")
if "# " not in self.log: if "# " not in self.log:
raise SystemError("Cannot login") raise SystemError("Cannot login")
@ -103,12 +100,12 @@ class Emulator(object):
# Run the given 'cmd' on the target # Run the given 'cmd' on the target
# return a tuple (output, exit_code) # return a tuple (output, exit_code)
def run(self, cmd): def run(self, cmd):
self.__write(cmd + "\n") self.qemu.sendline(cmd)
output = self.__read_until("# ") output = self.__read_until("# ")
output = output.strip().splitlines() output = output.strip().splitlines()
output = output[1:len(output)-1] output = output[1:len(output)-1]
self.__write("echo $?\n") self.qemu.sendline("echo $?")
exit_code = self.__read_until("# ") exit_code = self.__read_until("# ")
exit_code = exit_code.strip().splitlines()[1] exit_code = exit_code.strip().splitlines()[1]
exit_code = int(exit_code) exit_code = int(exit_code)