Merge branch 'nine' of git://github.com/delanne/buildbot into nine

+autopep8
buildbot · Dec 19, 2013 · ea55689 · ea55689
2 parents 3c09d04 + d91536a
commit ea55689
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/master/buildbot/buildslave/manager.py b/master/buildbot/buildslave/manager.py
@@ -31,7 +31,7 @@ def __init__(self, master, buildslave):
         self.buildslave = buildslave
 
     def __repr__(self):
-        return "<%s for %r>" % (self.__class__.__name__, self.slavename)
+        return "<%s for %r>" % (self.__class__.__name__, self.buildslave.slavename)
 
     @defer.inlineCallbacks
     def unregister(self):

diff --git a/master/buildbot/data/buildsets.py b/master/buildbot/data/buildsets.py
@@ -155,8 +155,10 @@ def addBuildset(self, waited_for, scheduler=None, sourcestamps=[], reason=u'',
                 builderid=builderid)
             self.master.mq.produce(('buildset', str(bsid),
                                    'builder', str(builderid),
-                                   'buildrequest', str(brid),
-                                   'new'), msg)
+                                    'buildrequest', str(brid),
+                                    'new'), msg)
+            # TODO
+            #~ self.master.mq.produce(('buildrequest', None, None, None, 'new'), dict(buildername=bn))
 
         # and the buildset itself
         msg = dict(

diff --git a/master/buildbot/process/botmaster.py b/master/buildbot/process/botmaster.py
@@ -147,9 +147,16 @@ def startService(self):
         def buildRequestAdded(key, msg):
             self.maybeStartBuildsForBuilder(msg['buildername'])
         # consume both 'new' and 'unclaimed' build requests
+
+        # TODO: Support for BuildRequest doesn't exist yet
+        # It's a temporary fix in order to wake up the BuildRequestDistributor
+        #
+        # self.buildrequest_consumer_new = self.master.mq.startConsuming(
+        #     buildRequestAdded,
+        #     ('buildrequest', None, None, None, 'new'))
         self.buildrequest_consumer_new = self.master.mq.startConsuming(
             buildRequestAdded,
-            ('buildrequest', None, None, None, 'new'))
+            ('buildset', None, 'builder', None, 'buildrequest', None, 'new'))
         self.buildrequest_consumer_unclaimed = self.master.mq.startConsuming(
             buildRequestAdded,
             ('buildrequest', None, None, None, 'unclaimed'))

diff --git a/master/buildbot/process/buildrequest.py b/master/buildbot/process/buildrequest.py
@@ -139,7 +139,7 @@ def _make_br(cls, brid, brdict, master):
                 ss.patch = (patch['level'], patch['body'], patch['subdir'])
                 ss.patch_info = (patch['author'], patch['comment'])
             else:
-                ss.patch = (None, None, None)
+                ss.patch = None
                 ss.patch_info = (None, None)
             ss.changes = []
             # XXX: sourcestamps don't have changes anymore; this affects merging!!

diff --git a/master/buildbot/status/buildstep.py b/master/buildbot/status/buildstep.py
@@ -301,6 +301,11 @@ def __getstate__(self):
         del d['finishedWatchers']
         del d['updates']
         del d['master']
+
+        for attr in ("getStatistic", "hasStatistic", "setStatistic"):
+            if attr in d:
+                del d[attr]
+
         return d
 
     def __setstate__(self, d):