set .master for buildsteps

buildbot · Nov 5, 2013 · 2c8d3dc · 2c8d3dc
1 parent f9fa86b
commit 2c8d3dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/master/buildbot/process/buildstep.py b/master/buildbot/process/buildstep.py
@@ -512,6 +512,7 @@ def __init__(self, **kwargs):
 
         self._acquiringLock = None
         self.stopped = False
+        self.master = None
 
     def __new__(klass, *args, **kwargs):
         self = object.__new__(klass)
@@ -533,6 +534,7 @@ def describe(self, done=False):
 
     def setBuild(self, build):
         self.build = build
+        self.master = self.build.master
 
     def setBuildSlave(self, buildslave):
         self.buildslave = buildslave

diff --git a/master/buildbot/test/regressions/test_shell_command_properties.py b/master/buildbot/test/regressions/test_shell_command_properties.py
@@ -13,6 +13,7 @@
 #
 # Copyright Buildbot Team Members
 
+import mock
 from twisted.trial import unittest
 
 from buildbot.steps.shell import ShellCommand, SetPropertyFromCommand
@@ -84,6 +85,7 @@ def testCommand(self):
         req = FakeBuildRequest("Testing", {ss.repository:ss}, None)
 
         b = f.newBuild([req])
+        b.master = mock.Mock(name='master')
         b.build_status = FakeBuildStatus()
         b.slavebuilder = FakeSlaveBuilder()
 
@@ -101,6 +103,7 @@ def testGoodStep(self):
         req = FakeBuildRequest("Testing", {ss.repository:ss}, None)
 
         b = f.newBuild([req])
+        b.master = mock.Mock(name='master')
         b.build_status = FakeBuildStatus()
         b.slavebuilder = FakeSlaveBuilder()
 

diff --git a/master/buildbot/test/unit/test_process_build.py b/master/buildbot/test/unit/test_process_build.py
@@ -111,6 +111,7 @@ def setUp(self):
 
         self.builder = self.createBuilder()
         self.build = Build([r])
+        self.build.master = self.master
         self.build.setBuilder(self.builder)
 
     def createBuilder(self):

diff --git a/master/buildbot/test/util/steps.py b/master/buildbot/test/util/steps.py
@@ -16,7 +16,7 @@
 import mock
 from buildbot import interfaces
 from buildbot.process import buildstep
-from buildbot.test.fake import remotecommand, fakebuild, slave
+from buildbot.test.fake import remotecommand, fakebuild, slave, fakemaster
 
 
 class BuildStepMixin(object):
@@ -73,10 +73,12 @@ def setupStep(self, step, slave_version={'*':"99.99"}, slave_env={}):
         """
         factory = interfaces.IBuildStepFactory(step)
         step = self.step = factory.buildStep()
+        self.master = fakemaster.make_master(testcase=self)
 
         # step.build
 
         b = self.build = fakebuild.FakeBuild()
+        b.master = self.master
         def getSlaveVersion(cmd, oldversion):
             if cmd in slave_version:
                 return slave_version[cmd]