Buildbot interrupts master-side source steps. Fixes #2356

master/buildbot/process/buildstep.py

@@ -785,6 +785,7 @@ def addURL(self, name, url):
         self.step_status.addURL(name, url)
 
     def runCommand(self, c):
+        self.cmd = c
         c.buildslave = self.buildslave
         d = c.run(self, self.remote)
         return d

master/buildbot/test/unit/test_process_buildstep.py

@@ -21,7 +21,7 @@
 from buildbot.process import buildstep
 from buildbot.process.buildstep import regex_log_evaluator
 from buildbot.status.results import FAILURE, SUCCESS, WARNINGS, EXCEPTION
-from buildbot.test.fake import fakebuild, remotecommand
+from buildbot.test.fake import fakebuild, remotecommand, slave
 from buildbot.test.util import config, steps, compat
 from buildbot.util.eventual import eventually
 
@@ -138,6 +138,15 @@ def test_setProperty(self):
         bs.setProperty("x", "abc", "test", runtime=True)
         props.setProperty.assert_called_with("x", "abc", "test", runtime=True)
 
+    def test_runCommand(self):
+        bs = buildstep.BuildStep()
+        bs.buildslave = slave.FakeSlave()
+        bs.remote = 'dummy'
+        cmd = buildstep.RemoteShellCommand("build", ["echo", "hello"], user=None)
+        cmd.run = lambda self, remote : SUCCESS
+        bs.runCommand(cmd)
+        self.assertEqual(bs.cmd, cmd)
+
     def test_hideStepIf_False(self):
         self._setupWaterfallTest(False, False)
         return self.runStep()