Merge "Improve precedence test"
This commit is contained in:
commit
5eb21c2c39
@ -2354,6 +2354,7 @@ class TestScheduler(testtools.TestCase):
|
|||||||
"Test that queue precedence works"
|
"Test that queue precedence works"
|
||||||
|
|
||||||
self.gearman_server.hold_jobs_in_queue = True
|
self.gearman_server.hold_jobs_in_queue = True
|
||||||
|
self.worker.hold_jobs_in_build = True
|
||||||
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
A = self.fake_gerrit.addFakeChange('org/project', 'master', 'A')
|
||||||
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
self.fake_gerrit.addEvent(A.getPatchsetCreatedEvent(1))
|
||||||
A.addApproval('CRVW', 2)
|
A.addApproval('CRVW', 2)
|
||||||
@ -2364,6 +2365,13 @@ class TestScheduler(testtools.TestCase):
|
|||||||
self.gearman_server.release()
|
self.gearman_server.release()
|
||||||
self.waitUntilSettled()
|
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.log.debug(self.history)
|
||||||
self.assertEqual(self.history[0].pipeline, 'gate')
|
self.assertEqual(self.history[0].pipeline, 'gate')
|
||||||
self.assertEqual(self.history[1].pipeline, 'check')
|
self.assertEqual(self.history[1].pipeline, 'check')
|
||||||
|
Loading…
Reference in New Issue
Block a user