mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

oeqa/selftest/case: Use bb.utils.remove() instead of shutil.remove()

Browse Source 
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)

(From OE-Core rev: e7c0d29e063d1a47004acdc07a63996be98c74ef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-11-27 12:03:50 +00:00
parent de5ed54deb
commit c2fdfb7981
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oeqa/selftest/case.py
+3 -1
View File
@@ -12,6 +12,8 @@ import oeqa.utils.ftools as ftools
from oeqa.utils.commands import runCmd, bitbake, get_bb_var from oeqa.utils.commands import runCmd, bitbake, get_bb_var
from oeqa.core.case import OETestCase from oeqa.core.case import OETestCase
import bb.utils
class OESelftestTestCase(OETestCase): class OESelftestTestCase(OETestCase):
def __init__(self, methodName="runTest"): def __init__(self, methodName="runTest"):
self._extra_tear_down_commands = [] self._extra_tear_down_commands = []
@@ -167,7 +169,7 @@ to ensure accurate results.")
if self._track_for_cleanup: if self._track_for_cleanup:
for path in self._track_for_cleanup: for path in self._track_for_cleanup:
if os.path.isdir(path): if os.path.isdir(path):
shutil.rmtree(path) bb.utils.remove(path, recurse=True)
if os.path.isfile(path): if os.path.isfile(path):
os.remove(path) os.remove(path)
self._track_for_cleanup = [] self._track_for_cleanup = []