From ddb9ef30dc41715ff30c1178f3830e35e26cd042 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 16 Sep 2013 21:04:58 -0700 Subject: [PATCH] On null changes serialize the id as null Currently it's serialized as "None" (the string). Change-Id: I75a8aeb6b11d5700f03baef95527016877ff8f92 --- tests/test_scheduler.py | 2 +- zuul/model.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py index 48baaeff97..a92efea4bf 100644 --- a/tests/test_scheduler.py +++ b/tests/test_scheduler.py @@ -2558,7 +2558,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) diff --git a/zuul/model.py b/zuul/model.py index 7fb81bcf84..440f3ba06c 100644 --- a/zuul/model.py +++ b/zuul/model.py @@ -722,11 +722,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