Merge djmitche/buildbot:bug2762 (PR #1828)

buildbot · Aug 27, 2015 · b0482de · b0482de
2 parents fa3ac65 + bc078d8
commit b0482de
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/master/buildbot/data/builds.py b/master/buildbot/data/builds.py
@@ -143,6 +143,14 @@ def get(self, resultSpec, kwargs):
             buildscol.append(data)
         defer.returnValue(buildscol)
 
+    def startConsuming(self, callback, options, kwargs):
+        builderid = kwargs.get('builderid')
+        if builderid is not None:
+            path = ('builders', str(builderid), 'builds', None, None)
+        else:
+            path = ('builds', None, None)
+        return self.master.mq.startConsuming(callback, path)
+
 
 class Build(base.ResourceType):
 

diff --git a/master/buildbot/schedulers/trysched.py b/master/buildbot/schedulers/trysched.py
@@ -290,7 +290,7 @@ def gotBuild(key, msg):
         builds = yield self.master.data.get(('buildrequests', self.brid, 'builds'))
         for build in builds:
             if build['buildid'] in reportedBuilds:
-                return
+                continue
             reportedBuilds.add(build['buildid'])
             yield subscriber.callRemote('newbuild',
                                         RemoteBuild(self.master, build, self.builderName),

diff --git a/master/buildbot/test/integration/test_try_client.py b/master/buildbot/test/integration/test_try_client.py
@@ -23,7 +23,6 @@
 from buildbot.schedulers import trysched
 from buildbot.test.util import dirs
 from buildbot.test.util import www
-from buildbot.test.util.decorators import flaky
 from twisted.cred import credentials
 from twisted.internet import defer
 from twisted.internet import reactor
@@ -133,7 +132,7 @@ def getSourceStamp(vctype, treetop, branch=None, repository=None):
 
         # stub out printStatus, as it's timing-based and thus causes
         # occasional test failures.
-        self.patch(tryclient.Try, 'printStatus', lambda: None)
+        self.patch(tryclient.Try, 'printStatus', lambda _: None)
 
         def output(*msg):
             msg = ' '.join(map(str, msg))
@@ -234,7 +233,6 @@ def test_userpass_no_wait(self):
         buildsets = yield self.master.db.buildsets.getBuildsets()
         self.assertEqual(len(buildsets), 1)
 
-    @flaky(bugNumber=2762)
     @defer.inlineCallbacks
     def test_userpass_wait(self):
         yield self.startMaster(