From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 3 Jul 2020 10:29:43 +0000 (+0100)
Subject: oeqa/targetcontrol: Attempt to fix log closure warning message
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~10620
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e15cc7801ec611f867f5b31028741722ac718c87;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

oeqa/targetcontrol: Attempt to fix log closure warning message

We continue to see the warning message:

WARNING: lib/bb/daemonize.py:76: ResourceWarning: unclosed file <_io.TextIOWrapper
name='build/tmp/work/qemux86_64-poky-linux/oe-selftest-image/1.0-r0/testimage/qemurunner_log.20200703011821'
mode='a' encoding='UTF-8'>

I've been unable to reprodue this but believe its caused by garbage
collection of the FileHandler used in QemuTarget being delayed until
after a new tinfoil instance is created by a subseqent test.

Force the log file to be closed when we stop using it to avoid this.

[YOCTO #13961]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 7bbba6016b2..19f5a4ea7e9 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -187,6 +187,7 @@ class QemuTarget(BaseTarget):
         except:
             pass
         self.logger.removeHandler(self.loggerhandler)
+        self.loggerhandler.close()
         self.connection = None
         self.ip = None
         self.server_ip = None