make fake and real addBuildsetFor.. methods match

README.md

@@ -146,6 +146,10 @@ For each resource type, we'll need the following (based on "Adding Resource Type
 * Steps' URLs should be stored as JSON objects giving both a title and a URL. :runner:
 * Validate messages using the same system as used to validate resource types
 
+## Testing ##
+
+The BaseScheduler's addBuildsetForXxx methods should have their signatures checked against the corresponding fakes.
+
 ## Status Rewrites ##
 
 The following will need to be rewritten:

master/buildbot/schedulers/base.py

@@ -175,7 +175,7 @@ def gotChange(self, change, important):
     ## starting bulids
 
     def addBuildsetForSourceStampsWithDefaults(self, reason, sourcestamps,
-            waited_for, properties=None, builderNames=None):
+            waited_for=False, properties=None, builderNames=None):
 
         if sourcestamps is None:
             sourcestamps = []
@@ -208,8 +208,9 @@ def getCodebaseDict(self, codebase):
         return self.codebases[codebase]
 
     @defer.inlineCallbacks
-    def addBuildsetForChanges(self, waited_for, reason='', external_idstring=None,
-            changeids=[], builderNames=None, properties=None):
+    def addBuildsetForChanges(self, waited_for=False, reason='',
+            external_idstring=None, changeids=[], builderNames=None,
+            properties=None):
         changesByCodebase = {}
 
         def get_last_change_for_codebase(codebase):
@@ -246,8 +247,9 @@ def get_last_change_for_codebase(codebase):
 
         defer.returnValue((bsid,brids))
 
-    def addBuildsetForSourceStamps(self, waited_for, sourcestamps=[], reason='',
-            external_idstring=None, properties=None, builderNames=None):
+    def addBuildsetForSourceStamps(self, waited_for=False, sourcestamps=[],
+            reason='', external_idstring=None, properties=None,
+            builderNames=None):
         # combine properties
         if properties:
             properties.updateFromProperties(self.properties)

master/buildbot/test/unit/test_schedulers_forcesched.py

@@ -126,6 +126,7 @@ def test_basicForce(self):
         self.assertEqual(self.addBuildsetCalls, [
             ('addBuildsetForSourceStampsWithDefaults', dict(
                 builderNames=['a'],
+                waited_for=False,
                 properties={
                     u'owner': ('user', u'Force Build Form'),
                     u'p1': ('e', u'Force Build Form'),
@@ -152,6 +153,7 @@ def test_force_allBuilders(self):
         self.assertEqual(self.addBuildsetCalls, [
             ('addBuildsetForSourceStampsWithDefaults', dict(
                 builderNames=['a', 'b'],
+                waited_for=False,
                 properties={
                     u'owner': ('user', u'Force Build Form'),
                     u'reason': ('because', u'Force Build Form'),
@@ -175,6 +177,7 @@ def test_force_someBuilders(self):
         self.assertEqual(self.addBuildsetCalls, [
             ('addBuildsetForSourceStampsWithDefaults', dict(
                 builderNames=['a', 'b'],
+                waited_for=False,
                 properties={
                     u'owner': ('user', u'Force Build Form'),
                     u'reason': ('because', u'Force Build Form'),
@@ -239,6 +242,7 @@ def test_good_codebases(self):
         self.assertEqual(self.addBuildsetCalls, [
             ('addBuildsetForSourceStampsWithDefaults', dict(
                 builderNames=['a'],
+                waited_for=False,
                 properties=expProperties,
                 reason=u"A build was forced by 'user': because",
                 sourcestamps=[
@@ -305,6 +309,7 @@ def do_ParameterTest(self,
         self.assertEqual(self.addBuildsetCalls, [
             ('addBuildsetForSourceStampsWithDefaults', dict(
                 builderNames=['a'],
+                waited_for=False,
                 properties=expect_props,
                 reason=u"A build was forced by 'user': because",
                 sourcestamps=[

master/buildbot/test/unit/test_schedulers_timed_NightlyTriggerable.py

@@ -49,7 +49,8 @@ def assertBuildsetAdded(self, sourcestamps={}, properties={}):
                 properties=properties,
                 reason=u"The NightlyTriggerable scheduler named 'test' "
                        u"triggered this build",
-                sourcestamps=sourcestamps)),
+                sourcestamps=sourcestamps,
+                waited_for=False)),
             ])
         self.addBuildsetCalls = []
 

master/buildbot/test/util/scheduler.py

@@ -168,7 +168,7 @@ def _addBuildsetReturnValue(self, builderNames):
         return defer.succeed((bsid, brids))
 
     def fake_addBuildsetForSourceStampsWithDefaults(self, reason, sourcestamps,
-            properties=None, builderNames=None):
+            waited_for=False, properties=None, builderNames=None):
         properties = properties.asDict()
         self.assertIsInstance(sourcestamps, list)
         sourcestamps.sort()
@@ -177,15 +177,16 @@ def fake_addBuildsetForSourceStampsWithDefaults(self, reason, sourcestamps,
         self.addBuildsetCalls[-1][1].pop('self')
         return self._addBuildsetReturnValue(builderNames)
 
-    def fake_addBuildsetForChanges(self, reason='', external_idstring=None,
+    def fake_addBuildsetForChanges(self, waited_for=False, reason='', external_idstring=None,
             changeids=[], builderNames=None, properties=None):
         properties = properties.asDict() if properties is not None else None
         self.addBuildsetCalls.append(('addBuildsetForChanges', locals()))
         self.addBuildsetCalls[-1][1].pop('self')
         return self._addBuildsetReturnValue(builderNames)
 
-    def fake_addBuildsetForSourceStamps(self, sourcestamps=[], reason='',
-            external_idstring=None, properties=None, builderNames=None):
+    def fake_addBuildsetForSourceStamps(self, waited_for=False, sourcestamps=[],
+            reason='', external_idstring=None, properties=None,
+            builderNames=None):
         properties=properties.asDict() if properties is not None else None
         self.assertIsInstance(sourcestamps, list)
         sourcestamps.sort()