Ticket #87: customprops-fix-debugclient.patch

buildbot/clients/debug.py

@@ -105 +105 @@
             if revision == '':
                 revision = None
         reason = "debugclient 'Request Build' button pushed"
+        custom_props = {}
         d = self.remote.callRemote("requestBuild",
-                                   name, reason, branch, revision)
+                                   name, reason, branch, revision, custom_props)
         d.addErrback(self.err)
 
     def do_ping(self, widget):

buildbot/master.py

@@ -227 +227 @@
     def detached(self, mind):
         pass
 
-    def perspective_requestBuild(self, buildername, reason, branch, revision):
+    def perspective_requestBuild(self, buildername, reason, branch, revision, custom_props):
+        assert isinstance(custom_props, dict), \
+               "custom_props must be a dict (not %r)" % (custom_props,)
+
+        # Provide default values for any custom build properties the
+        # client did not send.
+        for propertyDict in (self.master.customBuildProperties or []):
+            custom_props.setdefault(propertyDict['propertyName'], "")
+
         c = interfaces.IControl(self.master)
         bc = c.getBuilder(buildername)
         ss = SourceStamp(branch, revision)
-        br = BuildRequest(reason, ss, buildername)
+        br = BuildRequest(reason, ss, custom_props, buildername)
         bc.requestBuild(br)
 
     def perspective_pingBuilder(self, buildername):

buildbot/process/base.py

@@ -60 +60 @@
         # TODO: remove the =None on builderName, it is there so I don't have
         # to change a lot of tests that create BuildRequest objects
         assert interfaces.ISourceStamp(source, None)
-        assert custom_props is not None, "custom_props must not be None"
+        assert isinstance(custom_props, dict), \
+               "custom_props must be a dict (not %r)" % (custom_props,)
         self.reason = reason
         self.source = source
         self.custom_props = custom_props