test for and supply the right number of arguments to mergeRequests fu…

…nctions
buildbot · Jun 26, 2011 · de9ffe2 · de9ffe2
1 parent ba9ddd5
commit de9ffe2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/master/buildbot/process/builder.py b/master/buildbot/process/builder.py
@@ -808,7 +808,7 @@ def _mergeRequests(self, breq, unclaimed_requests, mergeRequests_fn):
         for other_breq_object in unclaimed_request_objects:
             wfd = defer.waitForDeferred(
                 defer.maybeDeferred(lambda :
-                    mergeRequests_fn(breq_object, other_breq_object)))
+                    mergeRequests_fn(self, breq_object, other_breq_object)))
             yield wfd
             if wfd.getResult():
                 merged_request_objects.append(other_breq_object)

diff --git a/master/buildbot/test/unit/test_process_builder.py b/master/buildbot/test/unit/test_process_builder.py
@@ -489,7 +489,7 @@ def test_mergeRequests(self):
         yield wfd
         brdicts = wfd.getResult()
 
-        def mergeRequests_fn(breq, other):
+        def mergeRequests_fn(builder, breq, other):
             # merge evens with evens, odds with odds
             return breq.id % 2 == other.id % 2