diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-14 23:24:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-16 17:43:00 +0100 |
commit | 663a7d657405b250d183d1c564b7bbb57bd1ad14 (patch) | |
tree | 90e54b8149a73c50b1968359c739231aa3f89576 | |
parent | 9d12605d7ef0c1c2eae8ab524df7013036819d83 (diff) | |
download | poky-663a7d657405b250d183d1c564b7bbb57bd1ad14.tar.gz |
bitbake: tests/runqueue: Ensure hashserv exits before deleting files
We've seen races where the socket may be gone but the server is still writing
out it's database. Handle that case too to avoid cleanup tracebacks.
[YOCTO #14440]
(Bitbake rev: b9e4fb843cb9d3a4d4404af093a781fab5520465)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/tests/runqueue.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/tests/runqueue.py b/bitbake/lib/bb/tests/runqueue.py index 3d51779d6c..4f335b8f19 100644 --- a/bitbake/lib/bb/tests/runqueue.py +++ b/bitbake/lib/bb/tests/runqueue.py | |||
@@ -361,7 +361,7 @@ class RunQueueTests(unittest.TestCase): | |||
361 | 361 | ||
362 | def shutdown(self, tempdir): | 362 | def shutdown(self, tempdir): |
363 | # Wait for the hashserve socket to disappear else we'll see races with the tempdir cleanup | 363 | # Wait for the hashserve socket to disappear else we'll see races with the tempdir cleanup |
364 | while os.path.exists(tempdir + "/hashserve.sock"): | 364 | while (os.path.exists(tempdir + "/hashserve.sock") or os.path.exists(tempdir + "cache/hashserv.db-wal")): |
365 | time.sleep(0.5) | 365 | time.sleep(0.5) |
366 | 366 | ||
367 | 367 | ||