Ticket #296: notifySchedulers.diff

buildbot/buildset.py

@@ -31 +31 @@
     def waitUntilFinished(self):
         return self.status.waitUntilFinished()
 
-    def start(self, builders):
+    def start(self, builders, notifyScheduler=None):
         """This is called by the BuildMaster to actually create and submit
         the BuildRequests."""
         self.requests = []
@@ -45 +45 @@
             self.requests.append(req)
             d = req.waitUntilFinished()
             d.addCallback(self.requestFinished, req)
+            if notifyScheduler:
+                req.subscribe(notifyScheduler.buildStarted)
+                d.addCallback(notifyScheduler.buildFinished, req)
 
         # tell our status about them
         req_statuses = [req.status for req in self.requests]

buildbot/interfaces.py

@@ -967 +967 @@
         themselves whether the change is interesting or not, and may initiate
         a build as a result."""
 
-    def submitBuildSet(buildset):
+    def submitBuildSet(buildset, notifyScheduler):
         """Submit a BuildSet object, which will eventually be run on all of
         the builders listed therein."""
 

buildbot/master.py

@@ -870 +870 @@
         for s in self.allSchedulers():
             s.addChange(change)
 
-    def submitBuildSet(self, bs):
+    def submitBuildSet(self, bs, notifyScheduler=None):
         # determine the set of Builders to use
         builders = []
         for name in bs.builderNames:
@@ -884 +884 @@
 
         # now tell the BuildSet to create BuildRequests for all those
         # Builders and submit them
-        bs.start(builders)
+        bs.start(builders, notifyScheduler)
         self.status.buildsetSubmitted(bs.status)
 
 
@@ -897 +897 @@
     def addChange(self, change):
         self.master.change_svc.addChange(change)
 
-    def submitBuildSet(self, bs):
-        self.master.submitBuildSet(bs)
+    def submitBuildSet(self, bs, notifyScheduler):
+        self.master.submitBuildSet(bs, notifyScheduler)
 
     def getBuilder(self, name):
         b = self.master.botmaster.builders[name]

buildbot/test/test_scheduler.py

@@ -14 +14 @@
 
 class FakeMaster(service.MultiService):
     d = None
-    def submitBuildSet(self, bs):
+    def submitBuildSet(self, bs, notifyScheduler):
         self.sets.append(bs)
         if self.d:
             reactor.callLater(0, self.d.callback, bs)