zuul
/
zuul
Code Issues Proposed changes

Merge "Fix race in CRD duplicates test"

This commit is contained in:
Jenkins 2015-04-03 21:59:02 +00:00 committed by Gerrit Code Review
parent b5da673ea3 dd84982d50
commit bdc579b22f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/test_scheduler.py
View File

@ -3438,10 +3438,13 @@ For CI problems and help debugging, contact ci@example.org"""
self.waitUntilSettled()
self.assertEqual(len(check_pipeline.getAllItems()), 3)
self.gearman_server.hold_jobs_in_queue = False
# Release jobs in order to avoid races with change A jobs
# finishing before change B jobs.
self.gearman_server.release('.*-merge')
self.gearman_server.release('project1-.*')
self.waitUntilSettled()
self.gearman_server.release('.*-merge')
self.gearman_server.release('project1-.*')
self.waitUntilSettled()
self.gearman_server.release()
self.waitUntilSettled()