zuul
/
zuul
Code Issues Proposed changes

Re-enable test_failed_change_at_head_with_queue 

This ensures the state of the queue, not the builds, so we cannot use
FakeBuild.hasChanges. This is unique, so there doesn't seem to be any
need to genericize the operation.

Change-Id: I13532f4038170ac4539f1d0131dd4a06e6ffd8ac
Story: 2000773
Task: 3377
This commit is contained in:
Clint Byrum 2016-11-16 16:28:50 -08:00
parent 61c9123d3f
commit 8b2bc0cfe7
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/test_scheduler.py
View File

@ -505,7 +505,6 @@ class TestScheduler(ZuulTestCase):
self.assertEqual(B.reported, 2)
self.assertEqual(C.reported, 2)
@skip("Disabled for early v3 development")
def test_failed_change_at_head_with_queue(self):
"Test that if a change at the head fails, queued jobs are canceled"
@ -527,8 +526,10 @@ class TestScheduler(ZuulTestCase):
queue = self.gearman_server.getQueue()
self.assertEqual(len(self.builds), 0)
self.assertEqual(len(queue), 1)
self.assertEqual(queue[0].name, 'build:project-merge')
self.assertTrue(self.job_has_changes(queue[0], A))
self.assertEqual(queue[0].name, 'launcher:launch')
job_args = json.loads(queue[0].arguments)
self.assertEqual(job_args['job'], 'project-merge')
self.assertEqual(job_args['items'][0]['number'], '%d' % A.number)
self.gearman_server.release('.*-merge')
self.waitUntilSettled()
@ -540,12 +541,19 @@ class TestScheduler(ZuulTestCase):
self.assertEqual(len(self.builds), 0)
self.assertEqual(len(queue), 6)
self.assertEqual(queue[0].name, 'build:project-test1')
self.assertEqual(queue[1].name, 'build:project-test2')
self.assertEqual(queue[2].name, 'build:project-test1')
self.assertEqual(queue[3].name, 'build:project-test2')
self.assertEqual(queue[4].name, 'build:project-test1')
self.assertEqual(queue[5].name, 'build:project-test2')
self.assertEqual(
json.loads(queue[0].arguments)['job'], 'project-test1')
self.assertEqual(
json.loads(queue[1].arguments)['job'], 'project-test2')
self.assertEqual(
json.loads(queue[2].arguments)['job'], 'project-test1')
self.assertEqual(
json.loads(queue[3].arguments)['job'], 'project-test2')
self.assertEqual(
json.loads(queue[4].arguments)['job'], 'project-test1')
self.assertEqual(
json.loads(queue[5].arguments)['job'], 'project-test2')
self.release(queue[0])
self.waitUntilSettled()