zuul
/
zuul
Code Issues Proposed changes

Merge "Add job dependencies to status.json" into feature/zuulv3

This commit is contained in:
Jenkins 2017-07-12 09:37:34 +00:00 committed by Gerrit Code Review
parent bad14effb1 65639f8d76
commit a634f6db85
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/unit/test_scheduler.py
View File

@ -2324,6 +2324,16 @@ class TestScheduler(ZuulTestCase):
uuid=status_jobs[2]['uuid']),
status_jobs[2]['report_url'])
# check job dependencies
self.assertIsNotNone(status_jobs[0]['dependencies'])
self.assertIsNotNone(status_jobs[1]['dependencies'])
self.assertIsNotNone(status_jobs[2]['dependencies'])
self.assertEqual(len(status_jobs[0]['dependencies']), 0)
self.assertEqual(len(status_jobs[1]['dependencies']), 1)
self.assertEqual(len(status_jobs[2]['dependencies']), 1)
self.assertIn('project-merge', status_jobs[1]['dependencies'])
self.assertIn('project-merge', status_jobs[2]['dependencies'])
def test_live_reconfiguration(self):
"Test that live reconfiguration works"
self.executor_server.hold_jobs_in_build = True

1
zuul/model.py
View File

@ -1693,6 +1693,7 @@ class QueueItem(object):
ret['jobs'].append({
'name': job.name,
'dependencies': list(job.dependencies),
'elapsed_time': elapsed,
'remaining_time': remaining,
'url': build_url,