commit ddb9ef30dc41715ff30c1178f3830e35e26cd042
author Alex Gaynor <alex.gaynor@gmail.com> Mon Sep 16 21:04:58 2013 -0700
committer Alex Gaynor <alex.gaynor@gmail.com> Mon Sep 16 21:09:34 2013 -0700
tree c74be84ff8f385f45f1be50dd24ac347b984bf60
parent fba9b247bf2c0e03d100a6ad343a6538953b2afc

On null changes serialize the id as null

Currently it's serialized as "None" (the string).

Change-Id: I75a8aeb6b11d5700f03baef95527016877ff8f92

tests/test_scheduler.py

diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
index 48baaef..a92efea 100644
--- a/tests/test_scheduler.py
+++ b/tests/test_scheduler.py
@@ -2558,7 +2558,7 @@
             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)

zuul/model.py

diff --git a/zuul/model.py b/zuul/model.py
index 7fb81bc..440f3ba 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -722,11 +722,8 @@
 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