zuul
/
zuul
Code Issues Proposed changes

Merge "Fix test race with paused build"

This commit is contained in:
Zuul 2020-02-14 15:33:28 +00:00 committed by Gerrit Code Review
parent 1e04bdb4aa 54bfda5a07
commit 418a144e93
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/base.py
View File

@ -3952,11 +3952,12 @@ class ZuulTestCase(BaseTestCase):
worker_build = self.executor_server.job_builds.get( worker_build = self.executor_server.job_builds.get(
server_job.unique.decode('utf8')) server_job.unique.decode('utf8'))
if worker_build: if worker_build:
if worker_build.isWaiting() or worker_build.paused: if build.paused:
continue continue
else: if worker_build.isWaiting():
self.log.debug("%s is running" % worker_build) continue
return False self.log.debug("%s is running" % worker_build)
return False
else: else:
self.log.debug("%s is unassigned" % server_job) self.log.debug("%s is unassigned" % server_job)
return False return False