zuul
/
zuul
Code Issues Proposed changes

Merge "Fix race in test for cancel of starting builds"

This commit is contained in:
Zuul 2021-05-06 06:53:25 +00:00 committed by Gerrit Code Review
parent 72d649cdd5 bbee4d45b7
commit de00c44021
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/test_scheduler.py
View File

@ -2693,7 +2693,13 @@ class TestScheduler(ZuulTestCase):
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
for _ in iterate_timeout(30, 'Wait for build to be in starting phase'):
if self.executor_server.job_workers:
if not self.executor_server.job_workers:
continue
# Wait until the BuildStartedEvent was processed by the scheduler
# as we need the worker info in order to cancel a build.
builds = self.scheds.first.sched.executor.builds.values()
if all(b.worker.name != "Unknown" for b in builds):
break
# Abandon change to cancel build