]> code.ossystems Code Review - openembedded-core.git/commitdiff
qemurunner.py: add try/except for pid handling race
authorTrevor Gamblin <trevor.gamblin@windriver.com>
Fri, 7 Feb 2020 13:46:52 +0000 (08:46 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 8 Feb 2020 13:19:56 +0000 (13:19 +0000)
In some instances, attempts to remove the qemu pidfile within the
stop() method fail despite the os.path.exists() call immediately
before implying that the file is present. Add a try/except block
to log a warning if this occurs, rather than failing outright,
since the process simply appears to be exiting at an inconvenient
time.

[YOCTO #13675]

Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/utils/qemurunner.py

index 2cada35d4800df8cbfa274c86518265e7e09cae3..47044222112add107cbd4f8a5a3b5ae22b79fadf 100644 (file)
@@ -406,7 +406,10 @@ class QemuRunner:
         self.qemupid = None
         self.ip = None
         if os.path.exists(self.qemu_pidfile):
-            os.remove(self.qemu_pidfile)
+            try:
+                os.remove(self.qemu_pidfile)
+            except FileNotFoundError as e:
+                self.logger.warning('qemu pidfile is no longer present')
         if self.monitorpipe:
             self.monitorpipe.close()