diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-27 12:03:50 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-06 10:16:45 +0000 |
| commit | ee8255128e11d69d82e6093b58b761dfe773e71d (patch) | |
| tree | e2ea8b409cb1d6e5a9282867a5807ea995a850b2 | |
| parent | 9fcfc43e1a51520a86761cf5534cff9e70167b77 (diff) | |
| download | openembedded-core-ee8255128e11d69d82e6093b58b761dfe773e71d.tar.gz openembedded-core-ee8255128e11d69d82e6093b58b761dfe773e71d.tar.bz2 openembedded-core-ee8255128e11d69d82e6093b58b761dfe773e71d.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.
(From OE-Core rev: 00a8fd5b93a5c19ce0b7498e2bc653ce8ad58aaf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/case.py | 4 |
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 = [] |