zuul
/
zuul
Code Issues Proposed changes

Fix race in test_crd_check_duplicate more 

The previous fix was insufficient because multiple merge jobs
could be run at once.  Using the new orderedRelease method however
should be sufficient, and it ensures only one job runs and finishes
at a time.

The previous code was more appropriate for a test of a gate
pipeline and was probably copied from it.

Change-Id: I0534c7ce6dd473cb71ba37c8c0fedef8e5ca72a5
This commit is contained in:
James E. Blair 2015-05-07 15:47:37 -07:00
parent aed43d2530
commit d765085300
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_scheduler.py
View File

@ -3476,12 +3476,7 @@ For CI problems and help debugging, contact ci@example.org"""
# Release jobs in order to avoid races with change A jobs
# finishing before change B jobs.
self.worker.release('.*-merge')
self.worker.release('project1-.*')
self.waitUntilSettled()
self.worker.release('.*-merge')
self.worker.release('project1-.*')
self.waitUntilSettled()
self.orderedRelease()
self.worker.hold_jobs_in_build = False
self.worker.release()
self.waitUntilSettled()