oeqa: Clean up logger handling
The logger handling in oeqa was confused at best. This patch: a) Passes in a logger through various qemu runner pieces b) Uses that logger consistently in the code c) Creates a logger for QemuRunner outside the bitbake namespace meaning we don't conflict with the tinfoil logging changes The result of this is more consistency. For runtime tests in testimage, the logs always contain the debug info, nothing is shwon on the console. For the oe-selftests, logs are intercepted and only shown if the test fails. (From OE-Core rev: ba8babc45141891d0624f9a181a580fa416e87ec) (From OE-Core rev: 22003f97ff7f53c32999dc466d26c1471ead9b6b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
parent
a71e71f9c4
commit
66f536ad57
|
|
@ -31,7 +31,7 @@ class OEQemuTarget(OESSHTarget):
|
|||
deploy_dir_image=dir_image, display=display,
|
||||
logfile=bootlog, boottime=boottime,
|
||||
use_kvm=kvm, dump_dir=dump_dir,
|
||||
dump_host_cmds=dump_host_cmds)
|
||||
dump_host_cmds=dump_host_cmds, logger=logger)
|
||||
|
||||
def start(self, params=None, extra_bootparams=None):
|
||||
if self.runner.start(params, extra_bootparams=extra_bootparams):
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
#
|
||||
|
||||
import re
|
||||
import logging
|
||||
|
||||
from oeqa.selftest.base import oeSelfTest
|
||||
from oeqa.utils.commands import bitbake, runqemu, get_bb_var
|
||||
|
|
@ -21,10 +20,6 @@ class RunqemuTests(oeSelfTest):
|
|||
self.fstypes = "ext4 iso hddimg vmdk qcow2 vdi"
|
||||
self.cmd_common = "runqemu nographic"
|
||||
|
||||
# Avoid emit the same record multiple times.
|
||||
mainlogger = logging.getLogger("BitBake.Main")
|
||||
mainlogger.propagate = False
|
||||
|
||||
self.write_config(
|
||||
"""
|
||||
MACHINE = "%s"
|
||||
|
|
|
|||
|
|
@ -18,19 +18,18 @@ from oeqa.utils.dump import TargetDumper
|
|||
from oeqa.controllers.testtargetloader import TestTargetLoader
|
||||
from abc import ABCMeta, abstractmethod
|
||||
|
||||
logger = logging.getLogger('BitBake.QemuRunner')
|
||||
|
||||
class BaseTarget(object, metaclass=ABCMeta):
|
||||
|
||||
supported_image_fstypes = []
|
||||
|
||||
def __init__(self, d):
|
||||
def __init__(self, d, logger):
|
||||
self.connection = None
|
||||
self.ip = None
|
||||
self.server_ip = None
|
||||
self.datetime = d.getVar('DATETIME')
|
||||
self.testdir = d.getVar("TEST_LOG_DIR")
|
||||
self.pn = d.getVar("PN")
|
||||
self.logger = logger
|
||||
|
||||
@abstractmethod
|
||||
def deploy(self):
|
||||
|
|
@ -40,7 +39,7 @@ class BaseTarget(object, metaclass=ABCMeta):
|
|||
if os.path.islink(sshloglink):
|
||||
os.unlink(sshloglink)
|
||||
os.symlink(self.sshlog, sshloglink)
|
||||
logger.info("SSH log file: %s" % self.sshlog)
|
||||
self.logger.info("SSH log file: %s" % self.sshlog)
|
||||
|
||||
@abstractmethod
|
||||
def start(self, params=None, ssh=True, extra_bootparams=None):
|
||||
|
|
@ -90,7 +89,7 @@ class QemuTarget(BaseTarget):
|
|||
|
||||
supported_image_fstypes = ['ext3', 'ext4', 'cpio.gz', 'wic']
|
||||
|
||||
def __init__(self, d, image_fstype=None, logger=None):
|
||||
def __init__(self, d, logger, image_fstype=None):
|
||||
|
||||
super(QemuTarget, self).__init__(d, logger)
|
||||
|
||||
|
|
@ -120,7 +119,7 @@ class QemuTarget(BaseTarget):
|
|||
self.qemurunnerlog = os.path.join(self.testdir, 'qemurunner_log.%s' % self.datetime)
|
||||
loggerhandler = logging.FileHandler(self.qemurunnerlog)
|
||||
loggerhandler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
|
||||
logger.addHandler(loggerhandler)
|
||||
self.logger.addHandler(loggerhandler)
|
||||
oe.path.symlink(os.path.basename(self.qemurunnerlog), os.path.join(self.testdir, 'qemurunner_log'), force=True)
|
||||
|
||||
if d.getVar("DISTRO") == "poky-tiny":
|
||||
|
|
@ -131,7 +130,8 @@ class QemuTarget(BaseTarget):
|
|||
display = d.getVar("BB_ORIGENV", False).getVar("DISPLAY"),
|
||||
logfile = self.qemulog,
|
||||
kernel = self.kernel,
|
||||
boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")))
|
||||
boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")),
|
||||
logger = logger)
|
||||
else:
|
||||
self.runner = QemuRunner(machine=d.getVar("MACHINE"),
|
||||
rootfs=self.rootfs,
|
||||
|
|
@ -142,7 +142,8 @@ class QemuTarget(BaseTarget):
|
|||
boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")),
|
||||
use_kvm = use_kvm,
|
||||
dump_dir = dump_dir,
|
||||
dump_host_cmds = d.getVar("testimage_dump_host"))
|
||||
dump_host_cmds = d.getVar("testimage_dump_host"),
|
||||
logger = logger)
|
||||
|
||||
self.target_dumper = TargetDumper(dump_target_cmds, dump_dir, self.runner)
|
||||
|
||||
|
|
@ -154,8 +155,8 @@ class QemuTarget(BaseTarget):
|
|||
os.unlink(qemuloglink)
|
||||
os.symlink(self.qemulog, qemuloglink)
|
||||
|
||||
logger.info("rootfs file: %s" % self.rootfs)
|
||||
logger.info("Qemu log file: %s" % self.qemulog)
|
||||
self.logger.info("rootfs file: %s" % self.rootfs)
|
||||
self.logger.info("Qemu log file: %s" % self.qemulog)
|
||||
super(QemuTarget, self).deploy()
|
||||
|
||||
def start(self, params=None, ssh=True, extra_bootparams='', runqemuparams='', launch_cmd='', discard_writes=True):
|
||||
|
|
@ -207,14 +208,14 @@ class SimpleRemoteTarget(BaseTarget):
|
|||
self.port = addr.split(":")[1]
|
||||
except IndexError:
|
||||
self.port = None
|
||||
logger.info("Target IP: %s" % self.ip)
|
||||
self.logger.info("Target IP: %s" % self.ip)
|
||||
self.server_ip = d.getVar("TEST_SERVER_IP")
|
||||
if not self.server_ip:
|
||||
try:
|
||||
self.server_ip = subprocess.check_output(['ip', 'route', 'get', self.ip ]).split("\n")[0].split()[-1]
|
||||
except Exception as e:
|
||||
bb.fatal("Failed to determine the host IP address (alternatively you can set TEST_SERVER_IP with the IP address of this machine): %s" % e)
|
||||
logger.info("Server IP: %s" % self.server_ip)
|
||||
self.logger.info("Server IP: %s" % self.server_ip)
|
||||
|
||||
def deploy(self):
|
||||
super(SimpleRemoteTarget, self).deploy()
|
||||
|
|
|
|||
|
|
@ -233,6 +233,12 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
|
|||
import bb.tinfoil
|
||||
import bb.build
|
||||
|
||||
# Need a non-'BitBake' logger to capture the runner output
|
||||
targetlogger = logging.getLogger('TargetRunner')
|
||||
targetlogger.setLevel(logging.DEBUG)
|
||||
handler = logging.StreamHandler(sys.stdout)
|
||||
targetlogger.addHandler(handler)
|
||||
|
||||
tinfoil = bb.tinfoil.Tinfoil()
|
||||
tinfoil.prepare(config_only=False, quiet=True)
|
||||
try:
|
||||
|
|
@ -250,31 +256,15 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
|
|||
for key, value in overrides.items():
|
||||
recipedata.setVar(key, value)
|
||||
|
||||
# The QemuRunner log is saved out, but we need to ensure it is at the right
|
||||
# log level (and then ensure that since it's a child of the BitBake logger,
|
||||
# we disable propagation so we don't then see the log events on the console)
|
||||
logger = logging.getLogger('BitBake.QemuRunner')
|
||||
logger.setLevel(logging.DEBUG)
|
||||
logger.propagate = False
|
||||
logdir = recipedata.getVar("TEST_LOG_DIR")
|
||||
|
||||
qemu = oeqa.targetcontrol.QemuTarget(recipedata, image_fstype)
|
||||
qemu = oeqa.targetcontrol.QemuTarget(recipedata, targetlogger, image_fstype)
|
||||
finally:
|
||||
# We need to shut down tinfoil early here in case we actually want
|
||||
# to run tinfoil-using utilities with the running QEMU instance.
|
||||
# Luckily QemuTarget doesn't need it after the constructor.
|
||||
tinfoil.shutdown()
|
||||
|
||||
# Setup bitbake logger as console handler is removed by tinfoil.shutdown
|
||||
bblogger = logging.getLogger('BitBake')
|
||||
bblogger.setLevel(logging.INFO)
|
||||
console = logging.StreamHandler(sys.stdout)
|
||||
bbformat = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
|
||||
if sys.stdout.isatty():
|
||||
bbformat.enable_color()
|
||||
console.setFormatter(bbformat)
|
||||
bblogger.addHandler(console)
|
||||
|
||||
try:
|
||||
qemu.deploy()
|
||||
try:
|
||||
|
|
@ -289,6 +279,7 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
|
|||
qemu.stop()
|
||||
except:
|
||||
pass
|
||||
targetlogger.removeHandler(handler)
|
||||
|
||||
def updateEnv(env_file):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ re_control_char = re.compile('[%s]' % re.escape("".join(control_chars)))
|
|||
|
||||
class QemuRunner:
|
||||
|
||||
def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm):
|
||||
def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, boottime, dump_dir, dump_host_cmds, use_kvm, logger):
|
||||
|
||||
# Popen object for runqemu
|
||||
self.runqemu = None
|
||||
|
|
@ -57,9 +57,7 @@ class QemuRunner:
|
|||
self.qemu_pidfile = 'pidfile_'+str(os.getpid())
|
||||
self.host_dumper = HostDumper(dump_host_cmds, dump_dir)
|
||||
|
||||
self.logger = logging.getLogger("BitBake.QemuRunner")
|
||||
self.handler = logging.StreamHandler(sys.stdout)
|
||||
self.logger.addHandler(self.handler)
|
||||
self.logger = logger
|
||||
|
||||
def create_socket(self):
|
||||
try:
|
||||
|
|
@ -370,7 +368,6 @@ class QemuRunner:
|
|||
self.ip = None
|
||||
if os.path.exists(self.qemu_pidfile):
|
||||
os.remove(self.qemu_pidfile)
|
||||
self.logger.removeHandler(self.handler)
|
||||
|
||||
def stop_qemu_system(self):
|
||||
if self.qemupid:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ from .qemurunner import QemuRunner
|
|||
|
||||
class QemuTinyRunner(QemuRunner):
|
||||
|
||||
def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, kernel, boottime):
|
||||
def __init__(self, machine, rootfs, display, tmpdir, deploy_dir_image, logfile, kernel, boottime, logger):
|
||||
|
||||
# Popen object for runqemu
|
||||
self.runqemu = None
|
||||
|
|
@ -40,6 +40,7 @@ class QemuTinyRunner(QemuRunner):
|
|||
self.socketfile = "console.sock"
|
||||
self.server_socket = None
|
||||
self.kernel = kernel
|
||||
self.logger = logger
|
||||
|
||||
|
||||
def create_socket(self):
|
||||
|
|
|
|||
Loading…
Reference in New Issue