summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-02 11:23:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-05 12:37:02 +0000
commit8cd28e2f3fc3f1565287614666cfcb9eb13fdfd5 (patch)
treedefe86a3e189d9e52ee175ff57648b96cc145d0c /meta/lib
parentf24df3f8b26afa521bbca47ad4ff016f6d1b68c8 (diff)
downloadpoky-8cd28e2f3fc3f1565287614666cfcb9eb13fdfd5.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) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 409e86d4bc..3a9ba024a9 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -207,8 +207,8 @@ class QemuRunner:
207 # No point waiting any longer 207 # No point waiting any longer
208 self.logger.debug('runqemu exited with code %d' % self.runqemu.returncode) 208 self.logger.debug('runqemu exited with code %d' % self.runqemu.returncode)
209 self._dump_host() 209 self._dump_host()
210 self.stop()
211 self.logger.debug("Output from runqemu:\n%s" % self.getOutput(output)) 210 self.logger.debug("Output from runqemu:\n%s" % self.getOutput(output))
211 self.stop()
212 return False 212 return False
213 time.sleep(0.5) 213 time.sleep(0.5)
214 214
@@ -220,8 +220,8 @@ class QemuRunner:
220 processes = ps.decode("utf-8") 220 processes = ps.decode("utf-8")
221 self.logger.debug("Running processes:\n%s" % processes) 221 self.logger.debug("Running processes:\n%s" % processes)
222 self._dump_host() 222 self._dump_host()
223 self.stop()
224 op = self.getOutput(output) 223 op = self.getOutput(output)
224 self.stop()
225 if op: 225 if op:
226 self.logger.error("Output from runqemu:\n%s" % op) 226 self.logger.error("Output from runqemu:\n%s" % op)
227 else: 227 else: