summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/commands.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-03 09:29:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:31 +0100
commit098d1a65e0192be1c7b816145fbeb41ed90ebf08 (patch)
tree00487cffec4daa9d2147701a362ea7d8399eb534 /meta/lib/oeqa/utils/commands.py
parente075a77c1435ad776a8dfc2f66061b61191f7a29 (diff)
downloadpoky-098d1a65e0192be1c7b816145fbeb41ed90ebf08.tar.gz
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: ee707090848d793e3b2d82dd3861ae22222682c0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/commands.py')
-rw-r--r--meta/lib/oeqa/utils/commands.py5
1 files changed, 1 insertions, 4 deletions
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,
351 351
352 finally: 352 finally:
353 targetlogger.removeHandler(handler) 353 targetlogger.removeHandler(handler)
354 try: 354 qemu.stop()
355 qemu.stop()
356 except:
357 pass
358 355
359def updateEnv(env_file): 356def updateEnv(env_file):
360 """ 357 """