handle BuilderConfig(.., mergeRequests=False); fixes #2555

buildbot · Sep 1, 2013 · f9b531e · f9b531e
1 parent ee1d0a5
commit f9b531e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -706,7 +706,7 @@ def getConfigDict(self):
             rv['env'] = self.env
         if self.properties:
             rv['properties'] = self.properties
-        if self.mergeRequests:
+        if self.mergeRequests is not None:
             rv['mergeRequests'] = self.mergeRequests
         if self.description:
             rv['description'] = self.description

diff --git a/master/buildbot/test/unit/test_config.py b/master/buildbot/test/unit/test_config.py
@@ -1115,6 +1115,18 @@ def test_getConfigDict(self):
             'slavenames': ['s2', 's1'],
         })
 
+    def test_getConfigDict_mergeRequests(self):
+        for mr in (False, lambda a,b,c:False):
+            cfg = config.BuilderConfig(name='b', mergeRequests=mr,
+                    factory=self.factory, slavename='s1')
+            self.assertEqual(cfg.getConfigDict(), {'builddir': 'b',
+                'mergeRequests': mr,
+                'name': 'b',
+                'slavebuilddir': 'b',
+                'factory': self.factory,
+                'slavenames': ['s1'],
+            })
+
 
 
 class FakeService(config.ReconfigurableServiceMixin,