Skip to content

Commit

Permalink
Try to call startBuild for all slaves, not just latent ones.
Browse files Browse the repository at this point in the history
  • Loading branch information
tomprince authored and Mikhail Sobolev committed May 18, 2015
1 parent 6c01ceb commit 81cd2b5
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 4 deletions.
10 changes: 6 additions & 4 deletions master/buildbot/process/slavebuilder.py
Expand Up @@ -70,6 +70,12 @@ def isBusy(self):

def buildStarted(self):
self.state = BUILDING
try:
slave_buildStarted = self.slave.buildStarted
except AttributeError:
pass
else:
slave_buildStarted(self)

def buildFinished(self):
self.state = IDLE
Expand Down Expand Up @@ -269,10 +275,6 @@ def detached(self):
AbstractSlaveBuilder.detached(self)
self.state = LATENT

def buildStarted(self):
AbstractSlaveBuilder.buildStarted(self)
self.slave.buildStarted(self)

def _attachFailure(self, why, where):
self.state = LATENT
return AbstractSlaveBuilder._attachFailure(self, why, where)
Expand Down
65 changes: 65 additions & 0 deletions master/buildbot/test/unit/test_process_slavebuilder.py
@@ -0,0 +1,65 @@
# This file is part of Buildbot. Buildbot is free software: you can
# redistribute it and/or modify it under the terms of the GNU General Public
# License as published by the Free Software Foundation, version 2.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc., 51
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Copyright Buildbot Team Members


from buildbot.buildslave.base import AbstractBuildSlave
from twisted.trial.unittest import TestCase

from buildbot.process.slavebuilder import AbstractSlaveBuilder


class TestAbstractSlaveBuilder(TestCase):
"""
Tests for ``AbstractSlaveBuilder``.
"""

def test_buildStarted_called(self):
"""
If the slave associated to slave builder has a ``buildStarted`` method,
calling ``buildStarted`` on the slave builder calls the method on the
slave with the slavebuilder as an argument.
"""
class ConcreteBuildSlave(AbstractBuildSlave):
_buildStartedCalls = []

def buildStarted(self, slavebuilder):
self._buildStartedCalls.append(slavebuilder)

slave = ConcreteBuildSlave("slave", "pass")
slavebuilder = AbstractSlaveBuilder()
# FIXME: This should call attached, instead of setting the attribute
# directly
slavebuilder.slave = slave
slavebuilder.buildStarted()

self.assertEqual(ConcreteBuildSlave._buildStartedCalls, [slavebuilder])

def test_buildStarted_missing(self):
"""
If the slave associated to slave builder doesn not have a
``buildStarted`` method, calling ``buildStarted`` on the slave builder
doesn't raise an exception.
"""
class ConcreteBuildSlave(AbstractBuildSlave):
pass

slave = ConcreteBuildSlave("slave", "pass")
slavebuilder = AbstractSlaveBuilder()
# FIXME: This should call attached, instead of setting the attribute
# directly
slavebuilder.slave = slave

# The following shouldn't raise an exception.
slavebuilder.buildStarted()

0 comments on commit 81cd2b5

Please sign in to comment.