Merge benallard/buildbot:patch-2 (PR #1278)

buildbot · Oct 24, 2014 · 00c0401 · 00c0401
2 parents e560b68 + d8c0baf
commit 00c0401
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/master/buildbot/schedulers/forcesched.py b/master/buildbot/schedulers/forcesched.py
@@ -118,6 +118,9 @@ def __init__(self, name, label=None, tablabel=None, regex=None, **kw):
         self.tablabel = self.label if tablabel is None else tablabel
         if regex:
             self.regex = re.compile(regex)
+        if 'value' in kw:
+            config.error("Use default='%s' instead of value=... to give a "
+                         "default Parameter value" % kw['value'])
         # all other properties are generically passed via **kw
         self.__dict__.update(kw)
 
@@ -515,8 +518,8 @@ def __init__(self,
         for k, v in fields_dict.items():
             if v is DefaultField:
                 v = StringParameter(name=k, label=k.capitalize() + ":")
-            if isinstance(branch, basestring):
-                v = FixedParameter(name=k, value=v)
+            elif isinstance(v, basestring):
+                v = FixedParameter(name=k, default=v)
             fields_dict[k] = v
 
         fields = filter(None, fields_dict.values())

diff --git a/master/buildbot/test/unit/test_schedulers_forcesched.py b/master/buildbot/test/unit/test_schedulers_forcesched.py
@@ -585,3 +585,7 @@ def test_listofmixed_properties(self):
                                                             codebases=['bar'], username="foo",
                                                             properties=[BaseParameter(name="test",),
                                                                         4567]))
+
+    def test_novalue_to_parameter(self):
+        self.assertRaisesConfigError("Use default='1234' instead of value=... to give a default Parameter value",
+                                     lambda: BaseParameter(name="test", value="1234"))