zuul
/
zuul
Code Issues Proposed changes

Merge "Improve precedence test"

This commit is contained in:
Jenkins 2013-07-19 00:09:57 +00:00 committed by Gerrit Code Review
parent 6736bebf61 8de58bde06
commit 5eb21c2c39
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_scheduler.py
View File

@ -2354,6 +2354,7 @@ class TestScheduler(testtools.TestCase):
"Test that queue precedence works"
self.gearman_server.hold_jobs_in_queue = True
self.worker.hold_jobs_in_build = True
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
A.addApproval('CRVW', 2)
@ -2364,6 +2365,13 @@ class TestScheduler(testtools.TestCase):
self.gearman_server.release()
self.waitUntilSettled()
# Run one build at a time to ensure non-race order:
for x in range(6):
self.release(self.builds[0])
self.waitUntilSettled()
self.worker.hold_jobs_in_build = False
self.waitUntilSettled()
self.log.debug(self.history)
self.assertEqual(self.history[0].pipeline, 'gate')
self.assertEqual(self.history[1].pipeline, 'check')