diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 23:27:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-16 17:41:59 +0100 |
commit | f4886717e5b46ab9db634b20e5f7c7951d9b2511 (patch) | |
tree | fc89fffa89a7529503f6b27172622d7715953122 /meta/lib/oeqa/selftest/context.py | |
parent | a34a0e75e76e1acd2a201b631f2a57ec322941a5 (diff) | |
download | poky-f4886717e5b46ab9db634b20e5f7c7951d9b2511.tar.gz |
oeqa: Update cleanup code to wait for hashserv exit
We sometimes see exceptions from code seeing the hashserv DB files
being removed at directory cleanup time. Add a check to ensure the
hashserv has written the data base journal (and hence likely exited)
before cleaning up.
This will hopefully avoid errors like:
Traceback (most recent call last):
File "[...]/meta/lib/oeqa/sdk/buildtools-cases/build.py", line 30, in test_libc
delay = delay - 1
File "/usr/lib/python3.6/tempfile.py", line 948, in __exit__
self.cleanup()
File "/usr/lib/python3.6/tempfile.py", line 952, in cleanup
_rmtree(self.name)
File "/usr/lib/python3.6/shutil.py", line 486, in rmtree
_rmtree_safe_fd(fd, path, onerror)
File "/usr/lib/python3.6/shutil.py", line 424, in _rmtree_safe_fd
_rmtree_safe_fd(dirfd, fullname, onerror)
File "/usr/lib/python3.6/shutil.py", line 444, in _rmtree_safe_fd
onerror(os.unlink, fullname, sys.exc_info())
File "/usr/lib/python3.6/shutil.py", line 442, in _rmtree_safe_fd
os.unlink(name, dir_fd=topfd)
FileNotFoundError: [Errno 2] No such file or directory: 'hashserv.db-wal'
(From OE-Core rev: 0b07d9add687d78495176cda0f3011c10ffa4d4b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest/context.py')
-rw-r--r-- | meta/lib/oeqa/selftest/context.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 1659926975..78c7a467e2 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py | |||
@@ -39,7 +39,7 @@ class NonConcurrentTestSuite(unittest.TestSuite): | |||
39 | 39 | ||
40 | def removebuilddir(d): | 40 | def removebuilddir(d): |
41 | delay = 5 | 41 | delay = 5 |
42 | while delay and os.path.exists(d + "/bitbake.lock"): | 42 | while delay and (os.path.exists(d + "/bitbake.lock") or os.path.exists(d + "/cache/hashserv.db-wal")): |
43 | time.sleep(1) | 43 | time.sleep(1) |
44 | delay = delay - 1 | 44 | delay = delay - 1 |
45 | # Deleting these directories takes a lot of time, use autobuilder | 45 | # Deleting these directories takes a lot of time, use autobuilder |