From c86541277ef3cd4782ff7599d921c36a1a09a3f4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Jun 2020 09:29:55 +0100 Subject: oeqa/targetcontrol: Rework exception handling to avoid warnings We're seeing: WARNING: bitbake/lib/bb/cookerdata.py:136: ResourceWarning: unclosed file <_io.FileIO name='tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testimage/qemurunner_log.20200601181912' mode='ab' closefd=True which can only be caused by the qemu.stop() method not being called. Tweak the error handling to fix the blanket exception handler which is likely meaning this function isn't getting called. (From OE-Core rev: bd2d32903f208b6a70abaa29b980db1498b84a02) Signed-off-by: Richard Purdie (cherry picked from commit ee707090848d793e3b2d82dd3861ae22222682c0) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oeqa/targetcontrol.py | 5 ++++- meta/lib/oeqa/utils/commands.py | 5 +---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index 2aa548e1ad..7bbba6016b 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py @@ -182,7 +182,10 @@ class QemuTarget(BaseTarget): return self.runner.is_alive() def stop(self): - self.runner.stop() + try: + self.runner.stop() + except: + pass self.logger.removeHandler(self.loggerhandler) self.connection = None self.ip = None diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index f1679875dc..df373c4169 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -351,10 +351,7 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, finally: targetlogger.removeHandler(handler) - try: - qemu.stop() - except: - pass + qemu.stop() def updateEnv(env_file): """ -- cgit v1.2.3-54-g00ecf