mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 12:32:12 +02:00
targetcontrol: Fix leaking log handler
We had a mystery failure on the autobuilder where runqemu appeared to be failing as a logfile directory no longer existed. The key to reproducing was running a runqemu where the image was deleted (as devtool does), then running another runqemu test. E.g.: 'oe-selftest -r devtool.DevtoolExtractTests.test_devtool_deploy_target wic.Wic2.test_qemu_efi' This then tries to write to the logfile from the first test, the image directory was deleted and we get strange failures. The fix is to remove the logging handler when qemu is stopped. (From OE-Core rev: b59a2bbbf3c56b71f6118970ed2269dddfbdbe0c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -117,9 +117,9 @@ class QemuTarget(BaseTarget):
|
||||
import oe.path
|
||||
bb.utils.mkdirhier(self.testdir)
|
||||
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"))
|
||||
self.logger.addHandler(loggerhandler)
|
||||
self.loggerhandler = logging.FileHandler(self.qemurunnerlog)
|
||||
self.loggerhandler.setFormatter(logging.Formatter("%(levelname)s: %(message)s"))
|
||||
self.logger.addHandler(self.loggerhandler)
|
||||
oe.path.symlink(os.path.basename(self.qemurunnerlog), os.path.join(self.testdir, 'qemurunner_log'), force=True)
|
||||
|
||||
if d.getVar("DISTRO") == "poky-tiny":
|
||||
@@ -183,6 +183,7 @@ class QemuTarget(BaseTarget):
|
||||
|
||||
def stop(self):
|
||||
self.runner.stop()
|
||||
self.logger.removeHandler(self.loggerhandler)
|
||||
self.connection = None
|
||||
self.ip = None
|
||||
self.server_ip = None
|
||||
|
||||
Reference in New Issue
Block a user