Browse Source

Merge "On null changes serialize the id as null"

changes/46/49646/1
Jenkins 9 years ago committed by Gerrit Code Review
parent
commit
9b647087fb
  1. 2
      tests/test_scheduler.py
  2. 5
      zuul/model.py

2
tests/test_scheduler.py

@ -2848,7 +2848,7 @@ class TestScheduler(testtools.TestCase):
for q in p['change_queues']:
for head in q['heads']:
for change in head:
self.assertEqual(change['id'], 'None')
self.assertEqual(change['id'], None)
for job in change['jobs']:
status_jobs.add(job['name'])
self.assertIn('project-bitrot-stable-old', status_jobs)

5
zuul/model.py

@ -770,11 +770,8 @@ class Ref(Changeish):
class NullChange(Changeish):
is_reportable = False
def __init__(self, project):
super(NullChange, self).__init__(project)
def _id(self):
return 'None'
return None
def equals(self, other):
return False

Loading…
Cancel
Save