Merge "Fix waitUntilSettled nodepool race"

This commit is contained in:
Zuul 2021-09-15 06:33:02 +00:00 committed by Gerrit Code Review
commit 010bf70c8b
1 changed files with 2 additions and 2 deletions

View File

@ -5345,8 +5345,8 @@ class ZuulTestCase(BaseTestCase):
for req in self.fake_nodepool.getNodeRequests():
if req['state'] != model.STATE_FULFILLED:
return False
r2 = nodepool.zk_nodepool.getNodeRequest(req['_oid'],
cached=True)
r2 = nodepool.zk_nodepool._node_request_cache.get(
req['_oid'])
if r2 and r2.state != req['state']:
return False
if req and not r2: