diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-02 11:23:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-16 14:31:33 +0000 |
commit | c7ff99ab44dbf6c9394d38194bd3996d21c490d4 (patch) | |
tree | f37aedd388f90cd1feedc1fab45af98d8f7a6a5f /meta/lib | |
parent | d69080b9dab4d256c41d6657442ce0ceb45c7b2d (diff) | |
download | poky-c7ff99ab44dbf6c9394d38194bd3996d21c490d4.tar.gz |
oeqa/utils/qemurunner: Avoid tracebacks on closed files
Reorder the shutdown/teardown to avoid:
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/utils/qemurunner.py", line 224, in launch
op = self.getOutput(output)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/utils/qemurunner.py", line 90, in getOutput
fl = fcntl.fcntl(o, fcntl.F_GETFL)
ValueError: I/O operation on closed file
(From OE-Core rev: 8e7d756862d2a8d62f3c87497d6d65ddb3c1b962)
(From OE-Core rev: 11d4bf460030eb6f072bd0e15550e26e055e632b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 03f46ffb1c..18afb55d2d 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -203,8 +203,8 @@ class QemuRunner: | |||
203 | # No point waiting any longer | 203 | # No point waiting any longer |
204 | self.logger.debug('runqemu exited with code %d' % self.runqemu.returncode) | 204 | self.logger.debug('runqemu exited with code %d' % self.runqemu.returncode) |
205 | self._dump_host() | 205 | self._dump_host() |
206 | self.stop() | ||
207 | self.logger.debug("Output from runqemu:\n%s" % self.getOutput(output)) | 206 | self.logger.debug("Output from runqemu:\n%s" % self.getOutput(output)) |
207 | self.stop() | ||
208 | return False | 208 | return False |
209 | time.sleep(0.5) | 209 | time.sleep(0.5) |
210 | 210 | ||
@@ -216,8 +216,8 @@ class QemuRunner: | |||
216 | processes = ps.decode("utf-8") | 216 | processes = ps.decode("utf-8") |
217 | self.logger.debug("Running processes:\n%s" % processes) | 217 | self.logger.debug("Running processes:\n%s" % processes) |
218 | self._dump_host() | 218 | self._dump_host() |
219 | self.stop() | ||
220 | op = self.getOutput(output) | 219 | op = self.getOutput(output) |
220 | self.stop() | ||
221 | if op: | 221 | if op: |
222 | self.logger.error("Output from runqemu:\n%s" % op) | 222 | self.logger.error("Output from runqemu:\n%s" % op) |
223 | else: | 223 | else: |