aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-14 23:24:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-16 17:42:53 +0100
commitb9e4fb843cb9d3a4d4404af093a781fab5520465 (patch)
treeecd90fde6be934241cd807e43919bb18592d283e
parent45ea7a937d81d68e3c1203a6e04a3f2f3cc607da (diff)
downloadbitbake-b9e4fb843cb9d3a4d4404af093a781fab5520465.tar.gz
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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/tests/runqueue.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/tests/runqueue.py b/lib/bb/tests/runqueue.py
index 3d51779d6..4f335b8f1 100644
--- a/lib/bb/tests/runqueue.py
+++ b/lib/bb/tests/runqueue.py
@@ -361,7 +361,7 @@ class RunQueueTests(unittest.TestCase):
def shutdown(self, tempdir):
# Wait for the hashserve socket to disappear else we'll see races with the tempdir cleanup
- while os.path.exists(tempdir + "/hashserve.sock"):
+ while (os.path.exists(tempdir + "/hashserve.sock") or os.path.exists(tempdir + "cache/hashserv.db-wal")):
time.sleep(0.5)