Make PBChangeSource more resilient to malformed data.

Signed-off-by: Tom Prince <tom.prince@ualberta.net>
buildbot · May 8, 2011 · e70e6f7 · e70e6f7
1 parent bb7b10d
commit e70e6f7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/master/buildbot/changes/pb.py b/master/buildbot/changes/pb.py
@@ -33,6 +33,16 @@ def detached(self, mind):
 
     def perspective_addChange(self, changedict):
         log.msg("perspective_addChange called")
+
+        if 'revlink' in changedict and not changedict['revlink']:
+            changedict['revlink'] = ''
+        if 'repository' in changedict and not changedict['repository']:
+            changedict['repository'] = ''
+        if 'project' in changedict and not changedict['project']:
+            changedict['project'] = ''
+        if 'files' not in changedict or not changedict['files']:
+            changedict['files'] = []
+
         files = []
         for path in changedict['files']:
             if self.prefix:

diff --git a/master/buildbot/test/unit/test_changes_pb.py b/master/buildbot/test/unit/test_changes_pb.py
@@ -102,3 +102,14 @@ def check(_):
                     [ dict(who="bar", files=['a']) ])
         d.addCallback(check)
         return d
+
+    def test_addChange_sanitize_None(self):
+        cp = pb.ChangePerspective(self.master, None)
+        d = cp.perspective_addChange(
+                dict(project=None, revlink=None, repository=None)
+                )
+        def check(_):
+            self.assertEqual(self.added_changes,
+                    [ dict(project="", revlink="", repository="", files=[]) ])
+        d.addCallback(check)
+        return d