aboutsummaryrefslogtreecommitdiffstats
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:10 +0100
commit36b1b4c4fcee9dde628c7113203939730ab12ae5 (patch)
tree8748122edad6ecdac66d57b64a34014807c9171b
parent20eae05fdd6cb7ace87ad005f72c256e2fddb3d0 (diff)
downloadbitbake-36b1b4c4fcee9dde628c7113203939730ab12ae5.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> (cherry picked from commit b9e4fb843cb9d3a4d4404af093a781fab5520465) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> 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)