summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 12:03:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 22:11:22 +0000
commit00a8fd5b93a5c19ce0b7498e2bc653ce8ad58aaf (patch)
tree8a9c6af20b9a6bc50fa4b3a06d09c7c925ad5426 /meta/lib
parent3dde0b749643575878bfbca2f8d2d9ec30bad166 (diff)
downloadopenembedded-core-contrib-00a8fd5b93a5c19ce0b7498e2bc653ce8ad58aaf.tar.gz
openembedded-core-contrib-00a8fd5b93a5c19ce0b7498e2bc653ce8ad58aaf.tar.bz2
openembedded-core-contrib-00a8fd5b93a5c19ce0b7498e2bc653ce8ad58aaf.zip
oeqa/selftest/case: Use bb.utils.remove() instead of shutil.remove()
This avoids problems where shutil.remove will error with: File "/usr/lib/python3.5/shutil.py", line 436, in _rmtree_safe_fd os.unlink(name, dir_fd=topfd) FileNotFoundError: [Errno 2] No such file or directory: 'S.gpg-agent.extra' when there are races over file deletion (gpg agent may be slow to exit). We already worked around speed and race issues in bb.utils. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/case.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/case.py b/meta/lib/oeqa/selftest/case.py
index 7a90a6b975..9c08d595ef 100644
--- a/meta/lib/oeqa/selftest/case.py
+++ b/meta/lib/oeqa/selftest/case.py
@@ -12,6 +12,8 @@ import oeqa.utils.ftools as ftools
from oeqa.utils.commands import runCmd, bitbake, get_bb_var
from oeqa.core.case import OETestCase
+import bb.utils
+
class OESelftestTestCase(OETestCase):
def __init__(self, methodName="runTest"):
self._extra_tear_down_commands = []
@@ -167,7 +169,7 @@ to ensure accurate results.")
if self._track_for_cleanup:
for path in self._track_for_cleanup:
if os.path.isdir(path):
- shutil.rmtree(path)
+ bb.utils.remove(path, recurse=True)
if os.path.isfile(path):
os.remove(path)
self._track_for_cleanup = []