summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-26 22:06:46 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-26 23:27:20 +0100
commit3c5a5bbc1998ff88a1a29786bfdcdb5c8a85f0e7 (patch)
treeabded6fbbdbe67ef16851804639e19985a81f0ab /bitbake
parenta9fdfc41baf74d42a9504f16fd4da735d1ed3879 (diff)
downloadpoky-3c5a5bbc1998ff88a1a29786bfdcdb5c8a85f0e7.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: 36b1b4c4fcee9dde628c7113203939730ab12ae5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit b9e4fb843cb9d3a4d4404af093a781fab5520465) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/tests/runqueue.py2
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