Added check that friendly_name is a valid string

master/buildbot/config.py

@@ -712,8 +712,12 @@ def __init__(self, name=None, slavename=None, startSlavenames=None, slavenames=N
             error("builder names must not start with an underscore: '%s'" % name)
         self.name = name
 
+        # friendly_name is not required
         if friendly_name is None:
             self.friendly_name = name
+        elif not isinstance(friendly_name, basestring):
+            error("builder's friendly name must be a valid string" % friendly_name)
+            self.friendly_name = name
         else:
             self.friendly_name = friendly_name
 

master/buildbot/test/unit/test_config.py

@@ -1179,6 +1179,13 @@ def test_no_friendly_name(self):
                               project="default",
                               friendly_name="b")
 
+    def test_nonstring_friendly_name(self):
+        def test_no_name(self):
+            self.assertRaisesConfigError(
+                "builder's friendly name must be a valid string",
+                lambda: config.BuilderConfig(
+                    factory=self.factory, slavenames=['s1'], project="default", friendly_name=1000))
+
     def test_getConfigDict(self):
         ns = lambda : 'ns'
         nb = lambda : 'nb'